From 4ab18dd77f524e90138b007abcf71441f0407129 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 20 Aug 2024 23:12:12 +0200
Subject: [PATCH 01/22] Minor changes

---
 example/dapp/lib/pages/pairings_page.dart     |  1 +
 example/dapp/lib/pages/sessions_page.dart     |  2 +-
 example/dapp/lib/utils/constants.dart         |  3 ---
 example/dapp/lib/utils/crypto/eip155.dart     |  4 +--
 example/dapp/web/index.html                   |  4 ---
 example/wallet/lib/pages/apps_page.dart       |  7 ++++-
 example/wallet/lib/pages/settings_page.dart   | 27 +++++++++++++++++++
 .../lib/utils/namespace_model_builder.dart    | 25 +----------------
 .../wc_connection_request_widget.dart         | 27 ++++++++++++++++---
 .../lib/src/lifecycle_event_handler.dart      |  1 -
 lib/apis/core/connectivity/connectivity.dart  | 10 +++----
 .../core/connectivity/i_connectivity.dart     |  4 ++-
 lib/apis/core/crypto/crypto_models.dart       |  1 +
 .../core/relay_auth/relay_auth_constants.dart |  6 ++---
 .../utils/auth/auth_api_validators.dart       |  8 +++---
 .../sign_api/utils/auth/auth_constants.dart   |  4 ++-
 .../sign_api/utils/auth/auth_signature.dart   |  2 +-
 lib/apis/utils/extensions.dart                | 12 ++++-----
 test/auth_api/validation_test.dart            | 14 +++++-----
 19 files changed, 93 insertions(+), 69 deletions(-)

diff --git a/example/dapp/lib/pages/pairings_page.dart b/example/dapp/lib/pages/pairings_page.dart
index eb5be822..0cd314ca 100644
--- a/example/dapp/lib/pages/pairings_page.dart
+++ b/example/dapp/lib/pages/pairings_page.dart
@@ -39,6 +39,7 @@ class PairingsPageState extends State<PairingsPage> {
 
   @override
   Widget build(BuildContext context) {
+    debugPrint('[$runtimeType] _pairings ${_pairings.length}');
     final List<PairingItem> pairingItems = _pairings
         .map(
           (PairingInfo pairing) => PairingItem(
diff --git a/example/dapp/lib/pages/sessions_page.dart b/example/dapp/lib/pages/sessions_page.dart
index eea88085..9f6305f0 100644
--- a/example/dapp/lib/pages/sessions_page.dart
+++ b/example/dapp/lib/pages/sessions_page.dart
@@ -41,7 +41,7 @@ class SessionsPageState extends State<SessionsPage> {
   @override
   Widget build(BuildContext context) {
     final List<SessionData> sessions = _activeSessions.values.toList();
-
+    debugPrint('[$runtimeType] sessions ${sessions.length}');
     return Center(
       child: Container(
         constraints: const BoxConstraints(
diff --git a/example/dapp/lib/utils/constants.dart b/example/dapp/lib/utils/constants.dart
index 58db7a28..a17612da 100644
--- a/example/dapp/lib/utils/constants.dart
+++ b/example/dapp/lib/utils/constants.dart
@@ -2,9 +2,6 @@ import 'package:flutter/material.dart';
 
 class Constants {
   static const smallScreen = 640;
-
-  static const String aud = 'https://walletconnect.org/login';
-  static const String domain = 'walletconnect.org';
 }
 
 class StyleConstants {
diff --git a/example/dapp/lib/utils/crypto/eip155.dart b/example/dapp/lib/utils/crypto/eip155.dart
index 29b358c1..0b6b747a 100644
--- a/example/dapp/lib/utils/crypto/eip155.dart
+++ b/example/dapp/lib/utils/crypto/eip155.dart
@@ -1,6 +1,4 @@
 import 'dart:convert';
-// ignore: depend_on_referenced_packages
-import 'package:convert/convert.dart';
 
 import 'package:walletconnect_flutter_v2_dapp/models/chain_metadata.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/chain_data.dart';
@@ -156,7 +154,7 @@ class EIP155 {
     required String message,
   }) async {
     final bytes = utf8.encode(message);
-    final encoded = '0x${hex.encode(bytes)}';
+    final encoded = bytesToHex(bytes);
 
     return await web3App.request(
       topic: topic,
diff --git a/example/dapp/web/index.html b/example/dapp/web/index.html
index 3bcca361..267bfd2d 100644
--- a/example/dapp/web/index.html
+++ b/example/dapp/web/index.html
@@ -38,10 +38,6 @@
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>
-  <!--Ethers-->
-  <!-- <script src="https://cdn.jsdelivr.net/npm/ethers@6.12.1/lib.commonjs/index.min.js" type="application/javascript"></script> -->
-  <!--Wallet Connect-->
-  <!-- <script src="https://cdn.jsdelivr.net/npm/@walletconnect/universal-provider@2.12.2/dist/index.cjs.min.js" type="application/javascript"></script> -->
 </head>
 <body>
   <script>
diff --git a/example/wallet/lib/pages/apps_page.dart b/example/wallet/lib/pages/apps_page.dart
index 813f1841..297d3a2a 100644
--- a/example/wallet/lib/pages/apps_page.dart
+++ b/example/wallet/lib/pages/apps_page.dart
@@ -78,7 +78,7 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
       final jsonObject = await EthUtils.decodeMessageEvent(event);
       if (!mounted) return;
       if (jsonObject is JsonRpcRequest &&
-          jsonObject.method == 'wc_sessionPing') {
+          jsonObject.method == MethodConstants.WC_SESSION_PING) {
         showPlatformToast(
           duration: const Duration(seconds: 1),
           child: Container(
@@ -141,6 +141,9 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Widget _buildNoPairingMessage() {
+    debugPrint('NO PAIRINGS');
+    final sessionsWithNoPairings = _web3Wallet.sessions.getAll();
+    debugPrint('${sessionsWithNoPairings.length} SESSIONS WITH NO PAIRINGS');
     return const Center(
       child: Text(
         StringConstants.noApps,
@@ -151,6 +154,7 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Widget _buildPairingList() {
+    debugPrint('${_pairings.length} PAIRINGS');
     final pairingItems = _pairings
         .map(
           (PairingInfo pairing) => PairingItem(
@@ -212,6 +216,7 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Future<void> _onFoundUri(String? uri) async {
+    debugPrint('[SampleWallet] _onFoundUri $uri');
     if ((uri ?? '').isEmpty) return;
     try {
       DeepLinkHandler.waiting.value = true;
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index b3e77ce6..ff4b2c47 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -72,6 +72,9 @@ class _SettingsPageState extends State<SettingsPage> {
                 _DeviceData(),
                 const SizedBox(height: 20.0),
                 const Divider(height: 1.0),
+                _Metadata(),
+                const SizedBox(height: 20.0),
+                const Divider(height: 1.0),
                 _Buttons(
                   onRestoreFromSeed: () async {
                     final mnemonic =
@@ -120,6 +123,30 @@ class _SettingsPageState extends State<SettingsPage> {
   }
 }
 
+class _Metadata extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
+    final nativeLink = web3Wallet.metadata.redirect?.native;
+    final universalLink = web3Wallet.metadata.redirect?.universal;
+    final linkMode = web3Wallet.metadata.redirect?.linkMode;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox.square(dimension: 20.0),
+          _DataContainer(
+            title: 'Redirect',
+            data:
+                'Native: $nativeLink\nUniversal: $universalLink\nLink Mode: $linkMode',
+          ),
+        ],
+      ),
+    );
+  }
+}
+
 class _EVMAccounts extends StatefulWidget {
   final VoidCallback onCreateAddress;
   final Function(String) onAccountChanged;
diff --git a/example/wallet/lib/utils/namespace_model_builder.dart b/example/wallet/lib/utils/namespace_model_builder.dart
index 5a27607f..65828ccd 100644
--- a/example/wallet/lib/utils/namespace_model_builder.dart
+++ b/example/wallet/lib/utils/namespace_model_builder.dart
@@ -1,8 +1,5 @@
-import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
-import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/string_constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_model.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_widget.dart';
@@ -72,31 +69,11 @@ class ConnectionWidgetBuilder {
         ),
       );
 
-      Map<String, void Function()> actions = {};
-      for (final String event in ns.events) {
-        actions[event] = () async {
-          final chainId = NamespaceUtils.getChainFromAccount(ns.accounts.first);
-          await GetIt.I<IWeb3WalletService>().web3wallet.emitSessionEvent(
-                topic: topic,
-                chainId: chainId,
-                event: SessionEventParams(
-                  name: event,
-                  data: int.tryParse(chainId.split(':').last),
-                ),
-              );
-          showPlatformToast(
-            child: Text('Event $event sent to dapp'),
-            // ignore: use_build_context_synchronously
-            context: context,
-          );
-        };
-      }
       if (ns.events.isNotEmpty) {
         models.add(
           WCConnectionModel(
-            title: '${StringConstants.events} (Tap to send)',
+            title: StringConstants.events,
             elements: ns.events,
-            elementActions: actions,
           ),
         );
       }
diff --git a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
index 3155bb42..9321aacc 100644
--- a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
+++ b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
@@ -16,22 +16,24 @@ class WCConnectionRequestWidget extends StatelessWidget {
     this.authPayloadParams,
     this.sessionAuthPayload,
     this.proposalData,
-    this.metadata,
+    this.requester,
     this.verifyContext,
   }) : super(key: key);
 
   final AuthPayloadParams? authPayloadParams;
   final SessionAuthPayload? sessionAuthPayload;
   final ProposalData? proposalData;
-  final ConnectionMetadata? metadata;
+  final ConnectionMetadata? requester;
   final VerifyContext? verifyContext;
 
   @override
   Widget build(BuildContext context) {
-    if (metadata == null) {
+    if (requester == null) {
       return const Text('ERROR');
     }
 
+    // final web3wallet = GetIt.I<IWeb3WalletService>().web3wallet;
+    // final linkMode = web3wallet.isTransportTypeLinkMode(requester?.metadata);
     return Container(
       decoration: BoxDecoration(
         color: Colors.white,
@@ -42,13 +44,30 @@ class WCConnectionRequestWidget extends StatelessWidget {
         mainAxisSize: MainAxisSize.min,
         children: [
           Text(
-            '${metadata!.metadata.name}\n${StringConstants.wouldLikeToConnect}',
+            '${requester!.metadata.name} ${StringConstants.wouldLikeToConnect}',
             style: StyleConstants.subtitleText.copyWith(
               fontSize: 18,
               color: Colors.black,
             ),
             textAlign: TextAlign.center,
           ),
+          // RichText(
+          //   text: TextSpan(
+          //     style: StyleConstants.bodyText.copyWith(
+          //       color: Colors.black,
+          //     ),
+          //     children: [
+          //       const TextSpan(text: 'Transport Type: '),
+          //       TextSpan(
+          //         text: linkMode ? 'LinkMode' : 'Relay',
+          //         style: StyleConstants.bodyText.copyWith(
+          //           color: linkMode ? Colors.blue : Colors.green,
+          //           fontWeight: FontWeight.bold,
+          //         ),
+          //       ),
+          //     ],
+          //   ),
+          // ),
           const SizedBox(height: StyleConstants.linear8),
           VerifyContextWidget(
             verifyContext: verifyContext,
diff --git a/example/wallet/packages/qr-bar-code-scanner-dialog/packages/qr_code_scanner/lib/src/lifecycle_event_handler.dart b/example/wallet/packages/qr-bar-code-scanner-dialog/packages/qr_code_scanner/lib/src/lifecycle_event_handler.dart
index ad38c607..deb1aaab 100644
--- a/example/wallet/packages/qr-bar-code-scanner-dialog/packages/qr_code_scanner/lib/src/lifecycle_event_handler.dart
+++ b/example/wallet/packages/qr-bar-code-scanner-dialog/packages/qr_code_scanner/lib/src/lifecycle_event_handler.dart
@@ -18,7 +18,6 @@ class LifecycleEventHandler extends WidgetsBindingObserver {
       case AppLifecycleState.paused:
       case AppLifecycleState.detached:
       case AppLifecycleState.hidden:
-        // TODO: Handle this case.
         break;
     }
   }
diff --git a/lib/apis/core/connectivity/connectivity.dart b/lib/apis/core/connectivity/connectivity.dart
index a1639538..d110e48c 100644
--- a/lib/apis/core/connectivity/connectivity.dart
+++ b/lib/apis/core/connectivity/connectivity.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter/foundation.dart';
 import 'package:walletconnect_flutter_v2/apis/core/connectivity/i_connectivity.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
@@ -10,9 +11,8 @@ class ConnectivityState implements IConnectivity {
 
   bool _initialized = false;
 
-  bool _isOnline = false;
   @override
-  bool get isOnline => _isOnline;
+  final isOnline = ValueNotifier<bool>(false);
 
   @override
   Future<void> init() async {
@@ -30,11 +30,11 @@ class ConnectivityState implements IConnectivity {
     final isMobileData = result.contains(ConnectivityResult.mobile);
     final isWifi = result.contains(ConnectivityResult.wifi);
 
-    _isOnline = isMobileData || isWifi;
+    isOnline.value = isMobileData || isWifi;
 
-    if (_isOnline && !_core.relayClient.isConnected) {
+    if (isOnline.value && !_core.relayClient.isConnected) {
       await _core.relayClient.connect();
-    } else if (!_isOnline && _core.relayClient.isConnected) {
+    } else if (!isOnline.value && _core.relayClient.isConnected) {
       await _core.relayClient.disconnect();
     }
   }
diff --git a/lib/apis/core/connectivity/i_connectivity.dart b/lib/apis/core/connectivity/i_connectivity.dart
index 8320cff6..015e9df1 100644
--- a/lib/apis/core/connectivity/i_connectivity.dart
+++ b/lib/apis/core/connectivity/i_connectivity.dart
@@ -1,4 +1,6 @@
+import 'package:flutter/foundation.dart';
+
 abstract class IConnectivity {
-  bool get isOnline;
+  ValueNotifier<bool> get isOnline;
   Future<void> init();
 }
diff --git a/lib/apis/core/crypto/crypto_models.dart b/lib/apis/core/crypto/crypto_models.dart
index 51e120db..6da6a70a 100644
--- a/lib/apis/core/crypto/crypto_models.dart
+++ b/lib/apis/core/crypto/crypto_models.dart
@@ -64,6 +64,7 @@ class EncodingValidation {
 class EncodeOptions {
   static const TYPE_0 = 0;
   static const TYPE_1 = 1;
+  static const TYPE_2 = 2;
 
   int? type;
   String? senderPublicKey;
diff --git a/lib/apis/core/relay_auth/relay_auth_constants.dart b/lib/apis/core/relay_auth/relay_auth_constants.dart
index 4fc8e82c..af371c1c 100644
--- a/lib/apis/core/relay_auth/relay_auth_constants.dart
+++ b/lib/apis/core/relay_auth/relay_auth_constants.dart
@@ -1,3 +1,3 @@
-class RelayAuthConstants {
-  static const String JWT_ENCODING = 'base64url';
-}
+// class RelayAuthConstants {
+//   static const String JWT_ENCODING = 'base64url';
+// }
diff --git a/lib/apis/sign_api/utils/auth/auth_api_validators.dart b/lib/apis/sign_api/utils/auth/auth_api_validators.dart
index 437e9db5..8c7e4583 100644
--- a/lib/apis/sign_api/utils/auth/auth_api_validators.dart
+++ b/lib/apis/sign_api/utils/auth/auth_api_validators.dart
@@ -3,8 +3,8 @@ import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
 class AuthApiValidators {
   static bool isValidRequestExpiry(int expiry) {
-    return AuthConstants.AUTH_REQUEST_EXPIRY_MIN <= expiry &&
-        expiry <= AuthConstants.AUTH_REQUEST_EXPIRY_MAX;
+    return StringConstants.AUTH_REQUEST_EXPIRY_MIN <= expiry &&
+        expiry <= StringConstants.AUTH_REQUEST_EXPIRY_MAX;
   }
 
   static bool isValidRequest(AuthRequestParams params) {
@@ -35,8 +35,8 @@ class AuthApiValidators {
     if (expiry != null && !isValidRequestExpiry(expiry)) {
       throw Errors.getInternalError(
         Errors.MISSING_OR_INVALID,
-        context:
-            'requestAuth() expiry: $expiry. Expiry must be a number (in seconds) between ${AuthConstants.AUTH_REQUEST_EXPIRY_MIN} and ${AuthConstants.AUTH_REQUEST_EXPIRY_MAX}',
+        context: 'requestAuth() expiry: $expiry. '
+            'Expiry must be a number (in seconds) between ${StringConstants.AUTH_REQUEST_EXPIRY_MIN} and ${StringConstants.AUTH_REQUEST_EXPIRY_MAX}',
       );
     }
 
diff --git a/lib/apis/sign_api/utils/auth/auth_constants.dart b/lib/apis/sign_api/utils/auth/auth_constants.dart
index 5508dcda..955e3809 100644
--- a/lib/apis/sign_api/utils/auth/auth_constants.dart
+++ b/lib/apis/sign_api/utils/auth/auth_constants.dart
@@ -1,6 +1,6 @@
 import 'package:walletconnect_flutter_v2/apis/utils/constants.dart';
 
-class AuthConstants {
+class StringConstants {
   static const AUTH_REQUEST_EXPIRY_MIN = WalletConnectConstants.FIVE_MINUTES;
   static const AUTH_REQUEST_EXPIRY_MAX = WalletConnectConstants.SEVEN_DAYS;
 
@@ -16,4 +16,6 @@ class AuthConstants {
 
   static const OCAUTH_CLIENT_PUBLIC_KEY_NAME =
       '$AUTH_STORAGE_PREFIX:$AUTH_CLIENT_PUBLIC_KEY_NAME';
+
+  static const WALLETCONNECT_LINK_MODE_APPS = 'WALLETCONNECT_LINK_MODE_APPS';
 }
diff --git a/lib/apis/sign_api/utils/auth/auth_signature.dart b/lib/apis/sign_api/utils/auth/auth_signature.dart
index 826a105e..0842c65d 100644
--- a/lib/apis/sign_api/utils/auth/auth_signature.dart
+++ b/lib/apis/sign_api/utils/auth/auth_signature.dart
@@ -137,7 +137,7 @@ class AuthSignature {
           nonPrefixedSignature;
 
       final Uri url = Uri.parse(
-        '${AuthConstants.AUTH_DEFAULT_URL}/?chainId=$chainId&projectId=$projectId',
+        '${StringConstants.AUTH_DEFAULT_URL}/?chainId=$chainId&projectId=$projectId',
       );
       final Map<String, dynamic> body = JsonRpcUtils.formatJsonRpcRequest(
         'eth_call',
diff --git a/lib/apis/utils/extensions.dart b/lib/apis/utils/extensions.dart
index 0d4c466c..1673d6c4 100644
--- a/lib/apis/utils/extensions.dart
+++ b/lib/apis/utils/extensions.dart
@@ -29,13 +29,13 @@ extension TransactionExtension2 on Map<String, dynamic> {
     return Transaction(
       from: EthereumAddress.fromHex(this['from']),
       to: EthereumAddress.fromHex(this['to']),
-      value: (this['value'] as String?).toEthereAmount(),
-      gasPrice: (this['gasPrice'] as String?).toEthereAmount(),
-      maxFeePerGas: (this['maxFeePerGas'] as String?).toEthereAmount(),
+      value: (this['value'] as String?)?.toEthereAmount(),
+      gasPrice: (this['gasPrice'] as String?)?.toEthereAmount(),
+      maxFeePerGas: (this['maxFeePerGas'] as String?)?.toEthereAmount(),
       maxPriorityFeePerGas:
-          (this['maxPriorityFeePerGas'] as String?).toEthereAmount(),
-      maxGas: (this['maxGas'] as String?).toIntFromHex(),
-      nonce: this['nonce']?.toInt(),
+          (this['maxPriorityFeePerGas'] as String?)?.toEthereAmount(),
+      maxGas: (this['maxGas'] as String?)?.toIntFromHex(),
+      nonce: (this['nonce'] as String?)?.toIntFromHex(),
       data: _parseTransactionData(this['data']),
     );
   }
diff --git a/test/auth_api/validation_test.dart b/test/auth_api/validation_test.dart
index 440b073d..a2075474 100644
--- a/test/auth_api/validation_test.dart
+++ b/test/auth_api/validation_test.dart
@@ -10,12 +10,12 @@ void main() {
   group('AuthValidators', () {
     test('isValidRequestExpiry', () {
       final List<int> expiries = [
-        AuthConstants.AUTH_REQUEST_EXPIRY_MIN - 1,
-        AuthConstants.AUTH_REQUEST_EXPIRY_MIN,
-        AuthConstants.AUTH_REQUEST_EXPIRY_MIN + 1,
-        AuthConstants.AUTH_REQUEST_EXPIRY_MAX - 1,
-        AuthConstants.AUTH_REQUEST_EXPIRY_MAX,
-        AuthConstants.AUTH_REQUEST_EXPIRY_MAX + 1,
+        StringConstants.AUTH_REQUEST_EXPIRY_MIN - 1,
+        StringConstants.AUTH_REQUEST_EXPIRY_MIN,
+        StringConstants.AUTH_REQUEST_EXPIRY_MIN + 1,
+        StringConstants.AUTH_REQUEST_EXPIRY_MAX - 1,
+        StringConstants.AUTH_REQUEST_EXPIRY_MAX,
+        StringConstants.AUTH_REQUEST_EXPIRY_MAX + 1,
       ];
       final List<bool> expiryResults = [
         false,
@@ -80,7 +80,7 @@ void main() {
           isA<WalletConnectError>().having(
             (e) => e.message,
             'message',
-            'Missing or invalid. requestAuth() expiry: ${testAuthRequestParamsInvalidExpiry.expiry}. Expiry must be a number (in seconds) between ${AuthConstants.AUTH_REQUEST_EXPIRY_MIN} and ${AuthConstants.AUTH_REQUEST_EXPIRY_MAX}',
+            'Missing or invalid. requestAuth() expiry: ${testAuthRequestParamsInvalidExpiry.expiry}. Expiry must be a number (in seconds) between ${StringConstants.AUTH_REQUEST_EXPIRY_MIN} and ${StringConstants.AUTH_REQUEST_EXPIRY_MAX}',
           ),
         ),
       );

From c0c849b5bbf1b15f16d25ee236806853b80360fd Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Wed, 21 Aug 2024 17:20:17 +0200
Subject: [PATCH 02/22] Mostly models changes

---
 example/wallet/ios/Runner/Runner.entitlements |  11 +
 .../cosmos_service.dart                       |   6 +-
 .../evm_service.dart                          | 147 +++---
 .../kadena_service.dart                       |   8 +-
 .../polkadot_service.dart                     |  18 +-
 .../solana_service.dart                       |  18 +-
 .../lib/dependencies/chains/common.dart       |  61 ---
 .../lib/dependencies/deep_link_handler.dart   | 107 ++---
 .../lib/dependencies/web3wallet_service.dart  | 208 +++++----
 example/wallet/lib/main.dart                  |  10 +-
 example/wallet/lib/pages/app_detail_page.dart |   7 +-
 example/wallet/lib/pages/apps_page.dart       |   2 +-
 example/wallet/lib/utils/methods_utils.dart   | 121 +++++
 example/wallet/pubspec.yaml                   |   2 +-
 lib/apis/auth_api/auth_engine.dart            |   9 +-
 .../core/pairing/utils/pairing_models.dart    |   3 +-
 .../pairing/utils/pairing_models.freezed.dart |  36 +-
 .../core/pairing/utils/pairing_models.g.dart  |   2 +
 .../relay_client/relay_client_models.dart     |  22 +-
 lib/apis/sign_api/i_sessions.dart             |   2 +
 lib/apis/sign_api/i_sign_client.dart          |   7 +
 lib/apis/sign_api/i_sign_engine_app.dart      |   3 +
 lib/apis/sign_api/i_sign_engine_common.dart   |   2 +
 lib/apis/sign_api/i_sign_engine_wallet.dart   |   2 +
 .../models/auth/auth_client_events.dart       |   5 +-
 .../models/auth/auth_client_models.dart       |   2 +
 .../auth/auth_client_models.freezed.dart      |  45 +-
 .../models/auth/auth_client_models.g.dart     |   9 +
 .../models/auth/session_auth_events.dart      |   6 +-
 .../models/auth/session_auth_models.dart      |   2 +
 .../auth/session_auth_models.freezed.dart     |  47 +-
 .../models/auth/session_auth_models.g.dart    |   9 +
 lib/apis/sign_api/models/json_rpc_models.dart |   3 +
 .../models/json_rpc_models.freezed.dart       | 127 ++++--
 .../sign_api/models/json_rpc_models.g.dart    |  17 +
 lib/apis/sign_api/models/session_models.dart  |   8 +-
 .../models/session_models.freezed.dart        | 179 ++++++--
 .../sign_api/models/session_models.g.dart     |  26 +-
 .../sign_api/models/sign_client_events.dart   |  19 +-
 lib/apis/sign_api/sessions.dart               |   5 +
 lib/apis/sign_api/sign_client.dart            |  17 +
 lib/apis/utils/constants.dart                 |   2 +
 lib/apis/web3app/web3app.dart                 |  16 +
 lib/apis/web3wallet/web3wallet.dart           |  14 +
 pubspec.yaml                                  |   1 +
 test/core_api/pairing_test.dart               |  10 +-
 test/shared/shared_test_utils.mocks.dart      | 431 ++++++++++++------
 .../utils/sign_client_test_wrapper.dart       |  20 +
 48 files changed, 1224 insertions(+), 610 deletions(-)
 create mode 100644 example/wallet/ios/Runner/Runner.entitlements
 rename example/wallet/lib/dependencies/{chains => chain_services}/cosmos_service.dart (89%)
 rename example/wallet/lib/dependencies/{chains => chain_services}/evm_service.dart (84%)
 rename example/wallet/lib/dependencies/{chains => chain_services}/kadena_service.dart (96%)
 rename example/wallet/lib/dependencies/{chains => chain_services}/polkadot_service.dart (93%)
 rename example/wallet/lib/dependencies/{chains => chain_services}/solana_service.dart (91%)
 delete mode 100644 example/wallet/lib/dependencies/chains/common.dart
 create mode 100644 example/wallet/lib/utils/methods_utils.dart

diff --git a/example/wallet/ios/Runner/Runner.entitlements b/example/wallet/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..da67a557
--- /dev/null
+++ b/example/wallet/ios/Runner/Runner.entitlements
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:lab.web3modal.com</string>
+    <string>applinks:dev.lab.web3modal.com</string>
+	</array>
+</dict>
+</plist>
diff --git a/example/wallet/lib/dependencies/chains/cosmos_service.dart b/example/wallet/lib/dependencies/chain_services/cosmos_service.dart
similarity index 89%
rename from example/wallet/lib/dependencies/chains/cosmos_service.dart
rename to example/wallet/lib/dependencies/chain_services/cosmos_service.dart
index 3e443810..6a3ec40a 100644
--- a/example/wallet/lib/dependencies/chains/cosmos_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/cosmos_service.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/common.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_metadata.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 
 class CosmosService {
   final _web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
@@ -41,7 +41,7 @@ class CosmosService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   Future<void> cosmosSignAmino(String topic, dynamic parameters) async {
@@ -60,6 +60,6 @@ class CosmosService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 }
diff --git a/example/wallet/lib/dependencies/chains/evm_service.dart b/example/wallet/lib/dependencies/chain_services/evm_service.dart
similarity index 84%
rename from example/wallet/lib/dependencies/chains/evm_service.dart
rename to example/wallet/lib/dependencies/chain_services/evm_service.dart
index 49887e53..f9ffce95 100644
--- a/example/wallet/lib/dependencies/chains/evm_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/evm_service.dart
@@ -5,17 +5,12 @@ import 'package:http/http.dart' as http;
 import 'package:eth_sig_util/eth_sig_util.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/common.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_metadata.dart';
-import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/eth_utils.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_model.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_widget.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/wc_request_widget.dart';
 
 enum SupportedEVMMethods {
   ethSign,
@@ -47,7 +42,6 @@ enum SupportedEVMMethods {
 }
 
 class EVMService {
-  final _bottomSheetService = GetIt.I<IBottomSheetService>();
   final _web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
 
   final ChainMetadata chainSupported;
@@ -107,11 +101,12 @@ class EVMService {
       jsonrpc: '2.0',
     );
 
-    if (await CommonMethods.requestApproval(
+    if (await MethodsUtils.requestApproval(
       message,
       method: pRequest.method,
       chainId: pRequest.chainId,
       address: address,
+      transportType: pRequest.transportType.name,
     )) {
       try {
         // Load the private key
@@ -146,9 +141,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -166,7 +161,10 @@ class EVMService {
       jsonrpc: '2.0',
     );
 
-    if (await CommonMethods.requestApproval(message)) {
+    if (await MethodsUtils.requestApproval(
+      message,
+      transportType: pRequest.transportType.name,
+    )) {
       try {
         // Load the private key
         final keys = GetIt.I<IKeyService>().getKeysForChain(
@@ -200,9 +198,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -219,7 +217,10 @@ class EVMService {
       jsonrpc: '2.0',
     );
 
-    if (await CommonMethods.requestApproval(data)) {
+    if (await MethodsUtils.requestApproval(
+      data,
+      transportType: pRequest.transportType.name,
+    )) {
       try {
         final keys = GetIt.I<IKeyService>().getKeysForChain(
           chainSupported.chainId,
@@ -249,9 +250,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -268,7 +269,10 @@ class EVMService {
       jsonrpc: '2.0',
     );
 
-    if (await CommonMethods.requestApproval(data)) {
+    if (await MethodsUtils.requestApproval(
+      data,
+      transportType: pRequest.transportType.name,
+    )) {
       try {
         final keys = GetIt.I<IKeyService>().getKeysForChain(
           chainSupported.chainId,
@@ -298,9 +302,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -324,6 +328,7 @@ class EVMService {
       data,
       method: pRequest.method,
       chainId: pRequest.chainId,
+      transportType: pRequest.transportType.name,
     );
     if (transaction is Transaction) {
       try {
@@ -365,9 +370,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -391,6 +396,7 @@ class EVMService {
       data,
       method: pRequest.method,
       chainId: pRequest.chainId,
+      transportType: pRequest.transportType.name,
     );
     if (transaction is Transaction) {
       try {
@@ -430,9 +436,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -474,9 +480,9 @@ class EVMService {
         topic: topic,
         response: response,
       );
-      CommonMethods.goBackToDapp(topic, true);
+      MethodsUtils.goBackToDapp(topic, true);
     } on WalletConnectError catch (error) {
-      DeepLinkHandler.goBackModal(
+      MethodsUtils.goBackModal(
         title: 'Error',
         message: error.message,
         success: false,
@@ -502,6 +508,7 @@ class EVMService {
     String? title,
     String? method,
     String? chainId,
+    required String transportType,
   }) async {
     Transaction transaction = tJson.toTransaction();
 
@@ -520,32 +527,6 @@ class EVMService {
         maxGas: gasLimit.toInt(),
       );
     } on RPCError catch (e) {
-      await _bottomSheetService.queueBottomSheet(
-        widget: Container(
-          color: Colors.white,
-          height: 210.0,
-          width: double.infinity,
-          padding: const EdgeInsets.all(20.0),
-          child: Column(
-            children: [
-              Icon(
-                Icons.error_outline_sharp,
-                color: Colors.red[100],
-                size: 80.0,
-              ),
-              Text(
-                'Error',
-                style: StyleConstants.subtitleText.copyWith(
-                  color: Colors.black,
-                  fontSize: 18.0,
-                ),
-              ),
-              Text(e.message),
-            ],
-          ),
-        ),
-      );
-
       return JsonRpcError(code: e.errorCode, message: e.message);
     }
 
@@ -554,30 +535,46 @@ class EVMService {
 
     const encoder = JsonEncoder.withIndent('  ');
     final trx = encoder.convert(tJson);
-    final WCBottomSheetResult rs = (await _bottomSheetService.queueBottomSheet(
-          widget: WCRequestWidget(
-            child: WCConnectionWidget(
-              title: title ?? 'Approve Transaction',
-              info: [
-                WCConnectionModel(
-                  title: 'Method: $method\n'
-                      'Chain ID: $chainId\n\n'
-                      'Transaction:',
-                  elements: [
-                    trx,
-                  ],
-                ),
-                WCConnectionModel(
-                  title: 'Gas price',
-                  elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],
-                ),
-              ],
-            ),
-          ),
-        )) ??
-        WCBottomSheetResult.reject;
-
-    if (rs != WCBottomSheetResult.reject) {
+    // final WCBottomSheetResult rs = (await _bottomSheetService.queueBottomSheet(
+    //       widget: WCRequestWidget(
+    //         // TODO
+    //         child: WCConnectionWidget(
+    //           title: title ?? 'Approve Transaction',
+    //           info: [
+    //             WCConnectionModel(
+    //               title: 'Method: $method\n'
+    //                   'Chain ID: $chainId\n\n'
+    //                   'Transaction:',
+    //               elements: [
+    //                 trx,
+    //               ],
+    //             ),
+    //             WCConnectionModel(
+    //               title: 'Gas price',
+    //               elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],
+    //             ),
+    //           ],
+    //         ),
+    //       ),
+    //     )) ??
+    //     WCBottomSheetResult.reject;
+
+    // if (rs != WCBottomSheetResult.reject) {
+    //   return transaction;
+    // }
+    if (await MethodsUtils.requestApproval(
+      trx,
+      title: title,
+      method: method,
+      chainId: chainId,
+      transportType: transportType,
+      extraModels: [
+        WCConnectionModel(
+          title: 'Gas price',
+          elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],
+        ),
+      ],
+    )) {
       return transaction;
     }
 
diff --git a/example/wallet/lib/dependencies/chains/kadena_service.dart b/example/wallet/lib/dependencies/chain_services/kadena_service.dart
similarity index 96%
rename from example/wallet/lib/dependencies/chains/kadena_service.dart
rename to example/wallet/lib/dependencies/chain_services/kadena_service.dart
index f0ee3790..d5ca9262 100644
--- a/example/wallet/lib/dependencies/chains/kadena_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/kadena_service.dart
@@ -5,11 +5,11 @@ import 'package:get_it/get_it.dart';
 
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/common.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_data.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_metadata.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/kadena_request_widget/kadena_request_widget.dart';
 
 import 'package:kadena_dart_sdk/kadena_dart_sdk.dart';
@@ -100,7 +100,7 @@ class KadenaService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   Future<void> kadenaSignV1(String topic, dynamic parameters) async {
@@ -168,7 +168,7 @@ class KadenaService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   Future<void> kadenaQuicksignV1(String topic, dynamic parameters) async {
@@ -255,7 +255,7 @@ class KadenaService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   void _onSessionRequest(SessionRequestEvent? args) async {
diff --git a/example/wallet/lib/dependencies/chains/polkadot_service.dart b/example/wallet/lib/dependencies/chain_services/polkadot_service.dart
similarity index 93%
rename from example/wallet/lib/dependencies/chains/polkadot_service.dart
rename to example/wallet/lib/dependencies/chain_services/polkadot_service.dart
index a364d49b..2188f80e 100644
--- a/example/wallet/lib/dependencies/chains/polkadot_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/polkadot_service.dart
@@ -6,13 +6,13 @@ import 'package:get_it/get_it.dart';
 import 'package:polkadart/scale_codec.dart';
 
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/common.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_metadata.dart';
 
 import 'package:polkadart/polkadart.dart';
 import 'package:polkadart_keyring/polkadart_keyring.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 
 class PolkadotService {
   // final _bottomSheetService = GetIt.I<IBottomSheetService>();
@@ -67,7 +67,11 @@ class PolkadotService {
       // adjust the default ss58Format for Kusama
       // keyPair.ss58Format = 2;
 
-      if (await CommonMethods.requestApproval(message, title: method)) {
+      if (await MethodsUtils.requestApproval(
+        message,
+        title: method,
+        transportType: pRequest.transportType.name,
+      )) {
         final encodedMessage = utf8.encode(message);
         final signature = keyPair.sign(encodedMessage);
 
@@ -97,7 +101,7 @@ class PolkadotService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   Future<void> polkadotSignTransaction(String topic, dynamic parameters) async {
@@ -117,7 +121,11 @@ class PolkadotService {
 
     const encoder = JsonEncoder.withIndent('  ');
     final message = encoder.convert(trxPayload);
-    if (await CommonMethods.requestApproval(message, title: method)) {
+    if (await MethodsUtils.requestApproval(
+      message,
+      title: method,
+      transportType: pRequest.transportType.name,
+    )) {
       try {
         final keyPair = await keyring.fromUri(keys[0].privateKey);
         // adjust the default ss58Format for Polkadot
@@ -161,7 +169,7 @@ class PolkadotService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   void _onSessionRequest(SessionRequestEvent? args) async {
diff --git a/example/wallet/lib/dependencies/chains/solana_service.dart b/example/wallet/lib/dependencies/chain_services/solana_service.dart
similarity index 91%
rename from example/wallet/lib/dependencies/chains/solana_service.dart
rename to example/wallet/lib/dependencies/chain_services/solana_service.dart
index 3c330f5b..1f306611 100644
--- a/example/wallet/lib/dependencies/chains/solana_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/solana_service.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/common.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_metadata.dart';
@@ -14,6 +13,7 @@ import 'package:solana/solana.dart';
 import 'package:solana/encoder.dart';
 // ignore: depend_on_referenced_packages
 import 'package:bs58/bs58.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 
 class SolanaService {
   Map<String, dynamic Function(String, dynamic)> get solanaRequestHandlers => {
@@ -56,7 +56,11 @@ class SolanaService {
       // it's being sent encoded from dapp
       final base58Decoded = base58.decode(message);
       final decodedMessage = utf8.decode(base58Decoded);
-      if (await CommonMethods.requestApproval(decodedMessage, title: method)) {
+      if (await MethodsUtils.requestApproval(
+        decodedMessage,
+        title: method,
+        transportType: pRequest.transportType.name,
+      )) {
         final signature = await keyPair.sign(base58Decoded.toList());
 
         response = response.copyWith(
@@ -82,7 +86,7 @@ class SolanaService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 
   Future<void> solanaSignTransaction(String topic, dynamic parameters) async {
@@ -113,7 +117,11 @@ class SolanaService {
 
       const encoder = JsonEncoder.withIndent('  ');
       final transaction = encoder.convert(params);
-      if (await CommonMethods.requestApproval(transaction, title: method)) {
+      if (await MethodsUtils.requestApproval(
+        transaction,
+        title: method,
+        transportType: pRequest.transportType.name,
+      )) {
         // Sign the transaction.
         final instructions = instructionsList.map((json) {
           return (json as Map<String, dynamic>).toInstruction();
@@ -149,7 +157,7 @@ class SolanaService {
       response: response,
     );
 
-    CommonMethods.goBackToDapp(topic, response.result ?? response.error);
+    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
   }
 }
 
diff --git a/example/wallet/lib/dependencies/chains/common.dart b/example/wallet/lib/dependencies/chains/common.dart
deleted file mode 100644
index 4e5f4758..00000000
--- a/example/wallet/lib/dependencies/chains/common.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get_it/get_it.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_model.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_widget.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/wc_request_widget.dart';
-
-class CommonMethods {
-  static void goBackToDapp(String topic, dynamic result) {
-    try {
-      final web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
-      final session = web3Wallet.sessions.get(topic);
-      final scheme = session?.peer.metadata.redirect?.native ?? '';
-      if (result is String) {
-        DeepLinkHandler.goTo(scheme, modalTitle: 'Success');
-      } else {
-        DeepLinkHandler.goTo(
-          scheme,
-          modalTitle: 'Error',
-          modalMessage: result.toString(),
-          success: false,
-        );
-      }
-    } catch (e) {
-      debugPrint('[SampleWallet] ${e.toString()}');
-    }
-  }
-
-  static Future<bool> requestApproval(
-    String text, {
-    String? title,
-    String? method,
-    String? chainId,
-    String? address,
-  }) async {
-    final bottomSheetService = GetIt.I<IBottomSheetService>();
-    final WCBottomSheetResult rs = (await bottomSheetService.queueBottomSheet(
-          widget: WCRequestWidget(
-            child: WCConnectionWidget(
-              title: title ?? 'Approve Request',
-              info: [
-                WCConnectionModel(
-                  title: 'Method: $method\n'
-                      'Chain ID: $chainId\n'
-                      'Address: $address\n\n'
-                      'Message:',
-                  elements: [
-                    text,
-                  ],
-                ),
-              ],
-            ),
-          ),
-        )) ??
-        WCBottomSheetResult.reject;
-
-    return rs != WCBottomSheetResult.reject;
-  }
-}
diff --git a/example/wallet/lib/dependencies/deep_link_handler.dart b/example/wallet/lib/dependencies/deep_link_handler.dart
index 57adba7e..33be57ac 100644
--- a/example/wallet/lib/dependencies/deep_link_handler.dart
+++ b/example/wallet/lib/dependencies/deep_link_handler.dart
@@ -1,12 +1,11 @@
-import 'dart:async';
+// import 'dart:async';
+import 'dart:developer';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get_it/get_it.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 
 class DeepLinkHandler {
   static const _methodChannel = MethodChannel(
@@ -15,8 +14,8 @@ class DeepLinkHandler {
   static const _eventChannel = EventChannel(
     'com.walletconnect.flutterwallet/events',
   );
-  static final _linksController = StreamController<String>.broadcast();
-  static Stream<String> get onLink => _linksController.stream;
+  // static final _linksController = StreamController<String>.broadcast();
+  // static Stream<String> get onLink => _linksController.stream;
   static final waiting = ValueNotifier<bool>(false);
 
   static void initListener() {
@@ -39,73 +38,39 @@ class DeepLinkHandler {
     }
   }
 
-  static void goTo(
-    String scheme, {
-    int delay = 100,
-    String? modalTitle,
-    String? modalMessage,
-    bool success = true,
-  }) async {
-    waiting.value = false;
-    await Future.delayed(Duration(milliseconds: delay));
-    debugPrint('[SampleWallet] [DeepLinkHandler] redirecting to $scheme');
-    try {
-      await launchUrlString(scheme, mode: LaunchMode.externalApplication);
-    } catch (e) {
-      debugPrint(
-          '[SampleWallet] [DeepLinkHandler] error re-opening dapp ($scheme). $e');
-      goBackModal(
-        title: modalTitle,
-        message: modalMessage,
-        success: success,
-      );
-    }
-  }
+  static IWeb3Wallet get _web3wallet =>
+      GetIt.I<IWeb3WalletService>().web3wallet;
+  static Uri get nativeUri =>
+      Uri.parse(_web3wallet.metadata.redirect?.native ?? '');
+  static Uri get universalUri =>
+      Uri.parse(_web3wallet.metadata.redirect?.universal ?? '');
+  static String get host => universalUri.host;
 
-  static void goBackModal({
-    String? title,
-    String? message,
-    bool success = true,
-  }) async {
-    waiting.value = false;
-    await GetIt.I<IBottomSheetService>().queueBottomSheet(
-      closeAfter: success ? 3 : 0,
-      widget: Container(
-        color: Colors.white,
-        height: 210.0,
-        width: double.infinity,
-        padding: const EdgeInsets.all(20.0),
-        child: Column(
-          children: [
-            Icon(
-              success ? Icons.check_circle_sharp : Icons.error_outline_sharp,
-              color: success ? Colors.green[100] : Colors.red[100],
-              size: 80.0,
-            ),
-            Text(
-              title ?? 'Connected',
-              style: StyleConstants.subtitleText.copyWith(
-                color: Colors.black,
-                fontSize: 18.0,
-              ),
-            ),
-            Text(message ?? 'You can go back to your dApp now'),
-          ],
-        ),
-      ),
-    );
-  }
-
-  static void _onLink(Object? event) {
-    final decodedUri = Uri.parse(Uri.decodeFull(event.toString()));
-    if (decodedUri.isScheme('wc')) {
-      waiting.value = true;
-      _linksController.sink.add(decodedUri.toString());
+  static void _onLink(Object? event) async {
+    log('[SampleWallet] _onLink $event');
+    final ev = WalletConnectUtils.getSearchParamFromURL('$event', 'wc_ev');
+    if (ev.isNotEmpty) {
+      log('[SampleWallet] is linkMode $event');
+      await _web3wallet.dispatchEnvelope('$event');
     } else {
-      if (decodedUri.query.startsWith('uri=')) {
-        final pairingUri = decodedUri.query.replaceFirst('uri=', '');
+      final decodedUri = Uri.parse(Uri.decodeFull(event.toString()));
+      if (decodedUri.isScheme('wc')) {
+        log('[SampleWallet] is legacy uri $decodedUri');
         waiting.value = true;
-        _linksController.sink.add(pairingUri);
+        // _linksController.sink.add(decodedUri.toString());
+        await _web3wallet.pair(uri: decodedUri);
+      } else {
+        final uriParam = WalletConnectUtils.getSearchParamFromURL(
+          '$decodedUri',
+          'uri',
+        );
+        if (decodedUri.isScheme(nativeUri.scheme) && uriParam.isNotEmpty) {
+          log('[SampleWallet] is custom uri $decodedUri');
+          waiting.value = true;
+          final pairingUri = decodedUri.query.replaceFirst('uri=', '');
+          // _linksController.sink.add(pairingUri);
+          await _web3wallet.pair(uri: Uri.parse(pairingUri));
+        }
       }
     }
   }
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 183a21e7..900d8854 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -7,15 +7,15 @@ import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/evm_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/evm_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/chain_key.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/models/chain_data.dart';
-import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/dart_defines.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/eth_utils.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_request/wc_connection_request_widget.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/wc_request_widget.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/wc_session_auth_request_widget.dart';
@@ -24,14 +24,39 @@ class Web3WalletService extends IWeb3WalletService {
   final _bottomSheetHandler = GetIt.I<IBottomSheetService>();
   Web3Wallet? _web3Wallet;
 
+  String get _flavor {
+    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
+    return flavor.replaceAll('-production', '');
+  }
+
+  String _universalLink() {
+    Uri link = Uri.parse('https://lab.web3modal.com/flutter_walletkit');
+    if (_flavor.isNotEmpty) {
+      return link
+          .replace(path: '${link.path}_internal')
+          .replace(host: 'dev.${link.host}')
+          .toString();
+    }
+    return link.toString();
+  }
+
+  Redirect _constructRedirect() {
+    return Redirect(
+      native: 'wcflutterwallet$_flavor://',
+      universal: _universalLink(),
+      // enable linkMode on Wallet so Dapps can use relay-less connection
+      // universal: value must be set on cloud config as well
+      linkMode: true,
+    );
+  }
+
   @override
   Future<void> create() async {
     // Create the web3wallet
-    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-    flavor = flavor.replaceAll('-production', '');
     _web3Wallet = Web3Wallet(
       core: Core(
         projectId: DartDefines.projectId,
+        logLevel: LogLevel.error,
       ),
       metadata: PairingMetadata(
         name: 'Sample Wallet Flutter',
@@ -40,10 +65,7 @@ class Web3WalletService extends IWeb3WalletService {
         icons: [
           'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png'
         ],
-        redirect: Redirect(
-          native: 'wcflutterwallet$flavor://',
-          // universal: 'https://walletconnect.com',
-        ),
+        redirect: _constructRedirect(),
       ),
     );
 
@@ -98,24 +120,27 @@ class Web3WalletService extends IWeb3WalletService {
   Future<void> init() async {
     // Await the initialization of the web3wallet
     await _web3Wallet!.init();
-
-    final sessions = _web3Wallet!.sessions.getAll();
-    final chainKeys = GetIt.I<IKeyService>().getKeysForChain('eip155');
-    for (var session in sessions) {
-      try {
-        final chainIds = NamespaceUtils.getChainIdsFromNamespaces(
-          namespaces: session.namespaces,
-        );
-        _web3Wallet!.emitSessionEvent(
-          topic: session.topic,
-          chainId: chainIds.first,
-          event: SessionEventParams(
-            name: 'accountsChanged',
-            data: [chainKeys.first.address],
-          ),
-        );
-      } catch (_) {}
-    }
+    _web3Wallet!.core.connectivity.isOnline.addListener(() {
+      if (_web3Wallet!.core.connectivity.isOnline.value) {
+        final sessions = _web3Wallet!.sessions.getAll();
+        final chainKeys = GetIt.I<IKeyService>().getKeysForChain('eip155');
+        for (var session in sessions) {
+          try {
+            final chainIds = NamespaceUtils.getChainIdsFromNamespaces(
+              namespaces: session.namespaces,
+            );
+            _web3Wallet!.emitSessionEvent(
+              topic: session.topic,
+              chainId: chainIds.first,
+              event: SessionEventParams(
+                name: 'accountsChanged',
+                data: ['${chainIds.first}:${chainKeys.first.address}'],
+              ),
+            );
+          } catch (_) {}
+        }
+      }
+    });
   }
 
   void _logListener(LogEvent event) {
@@ -149,9 +174,9 @@ class Web3WalletService extends IWeb3WalletService {
   Web3Wallet get web3wallet => _web3Wallet!;
 
   List<String> get _loaderMethods => [
-        'wc_sessionPropose',
-        'wc_sessionRequest',
-        'wc_sessionAuthenticate',
+        MethodConstants.WC_SESSION_PROPOSE,
+        MethodConstants.WC_SESSION_REQUEST,
+        MethodConstants.WC_SESSION_AUTHENTICATE,
       ];
 
   void _onRelayClientMessage(MessageEvent? event) async {
@@ -174,7 +199,7 @@ class Web3WalletService extends IWeb3WalletService {
               child: WCConnectionRequestWidget(
                 proposalData: args.params,
                 verifyContext: args.verifyContext,
-                metadata: args.params.proposer,
+                requester: args.params.proposer,
               ),
             ),
           )) ??
@@ -184,15 +209,16 @@ class Web3WalletService extends IWeb3WalletService {
         // generatedNamespaces is constructed based on registered methods handlers
         // so if you want to handle requests using onSessionRequest event then you would need to manually add that method in the approved namespaces
         try {
-          await _web3Wallet!.approveSession(
+          final response = await _web3Wallet!.approveSession(
             id: args.id,
             namespaces: NamespaceUtils.regenerateNamespacesWithChains(
               args.params.generatedNamespaces!,
             ),
             sessionProperties: args.params.sessionProperties,
           );
+          MethodsUtils.goBackToDapp(response.topic, 'success');
         } on WalletConnectError catch (error) {
-          DeepLinkHandler.goBackModal(
+          MethodsUtils.goBackModal(
             title: 'Error',
             message: error.message,
             success: false,
@@ -204,14 +230,13 @@ class Web3WalletService extends IWeb3WalletService {
         await _web3Wallet!.core.pairing.disconnect(
           topic: args.params.pairingTopic,
         );
-
-        final scheme = args.params.proposer.metadata.redirect?.native ?? '';
-        DeepLinkHandler.goTo(
-          scheme,
-          modalTitle: 'Error',
-          modalMessage: error.message,
-          success: false,
-        );
+        MethodsUtils.openApp(args.params.proposer.metadata, onFail: ([error]) {
+          MethodsUtils.goBackModal(
+            title: 'Error',
+            message: 'User rejected',
+            success: false,
+          );
+        });
       }
     }
   }
@@ -227,29 +252,10 @@ class Web3WalletService extends IWeb3WalletService {
         errorMessage =
             errorMessage.replaceFirst('Supported:', '\n\nSupported:');
       }
-      GetIt.I<IBottomSheetService>().queueBottomSheet(
-        widget: Container(
-          color: Colors.white,
-          width: double.infinity,
-          padding: const EdgeInsets.all(20.0),
-          child: Column(
-            children: [
-              Icon(
-                Icons.error_outline_sharp,
-                color: Colors.red[100],
-                size: 80.0,
-              ),
-              Text(
-                'Error',
-                style: StyleConstants.subtitleText.copyWith(
-                  color: Colors.black,
-                  fontSize: 18.0,
-                ),
-              ),
-              Text(errorMessage),
-            ],
-          ),
-        ),
+      MethodsUtils.goBackModal(
+        title: 'Error',
+        message: errorMessage,
+        success: false,
       );
     }
   }
@@ -257,8 +263,7 @@ class Web3WalletService extends IWeb3WalletService {
   void _onSessionConnect(SessionConnect? args) {
     if (args != null) {
       log('[SampleWallet] _onSessionConnect ${jsonEncode(args.session.toJson())}');
-      final scheme = args.session.peer.metadata.redirect?.native ?? '';
-      DeepLinkHandler.goTo(scheme);
+      MethodsUtils.goBackToDapp(args.session.topic, 'success');
     }
   }
 
@@ -305,7 +310,7 @@ class Web3WalletService extends IWeb3WalletService {
                   child: WCConnectionRequestWidget(
                     sessionAuthPayload: newAuthPayload,
                     verifyContext: args.verifyContext,
-                    metadata: args.requester,
+                    requester: args.requester,
                   ),
                 ),
               )) ??
@@ -340,14 +345,13 @@ class Web3WalletService extends IWeb3WalletService {
         }
         //
         try {
-          await _web3Wallet!.approveSessionAuthenticate(
+          final response = await _web3Wallet!.approveSessionAuthenticate(
             id: args.id,
             auths: cacaos,
           );
-          final scheme = args.requester.metadata.redirect?.native ?? '';
-          DeepLinkHandler.goTo(scheme);
+          MethodsUtils.goBackToDapp(response.session!.topic, 'success');
         } on WalletConnectError catch (error) {
-          DeepLinkHandler.goBackModal(
+          MethodsUtils.goBackModal(
             title: 'Error',
             message: error.message,
             success: false,
@@ -358,13 +362,13 @@ class Web3WalletService extends IWeb3WalletService {
           id: args.id,
           reason: Errors.getSdkError(Errors.USER_REJECTED_AUTH),
         );
-        final scheme = args.requester.metadata.redirect?.native ?? '';
-        DeepLinkHandler.goTo(
-          scheme,
-          modalTitle: 'Error',
-          modalMessage: 'User rejected',
-          success: false,
-        );
+        MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
+          MethodsUtils.goBackModal(
+            title: 'Error',
+            message: 'User rejected',
+            success: false,
+          );
+        });
       }
     }
   }
@@ -378,7 +382,7 @@ class Web3WalletService extends IWeb3WalletService {
                 widget: WCRequestWidget(
                   child: WCConnectionRequestWidget(
                     authPayloadParams: args.payloadParams,
-                    metadata: args.requester,
+                    requester: args.requester,
                   ),
                 ),
               )) ??
@@ -404,30 +408,42 @@ class Web3WalletService extends IWeb3WalletService {
         );
         final hexSignature = bytesToHex(signature, include0x: true);
 
-        await _web3Wallet!.respondAuthRequest(
-          id: args.id,
-          iss: iss,
-          signature: CacaoSignature(
-            t: CacaoSignature.EIP191,
-            s: hexSignature,
-          ),
-        );
-        final scheme = args.requester.metadata.redirect?.native ?? '';
-        DeepLinkHandler.goTo(scheme);
+        try {
+          await _web3Wallet!.respondAuthRequest(
+            id: args.id,
+            iss: iss,
+            signature: CacaoSignature(
+              t: CacaoSignature.EIP191,
+              s: hexSignature,
+            ),
+          );
+          MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
+            MethodsUtils.goBackModal(
+              title: 'Success',
+              message: 'You can go back to ${args.requester.metadata.name}',
+              success: true,
+            );
+          });
+        } on WalletConnectError catch (error) {
+          MethodsUtils.goBackModal(
+            title: 'Error',
+            message: error.message,
+            success: false,
+          );
+        }
       } else {
         await _web3Wallet!.respondAuthRequest(
           id: args.id,
           iss: iss,
           error: Errors.getSdkError(Errors.USER_REJECTED_AUTH),
         );
-        // TODO this should be triggered on _onRelayClientMessage
-        final scheme = args.requester.metadata.redirect?.native ?? '';
-        DeepLinkHandler.goTo(
-          scheme,
-          modalTitle: 'Error',
-          modalMessage: 'User rejected',
-          success: false,
-        );
+        MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
+          MethodsUtils.goBackModal(
+            title: 'Error',
+            message: 'User rejected',
+            success: false,
+          );
+        });
       }
     }
   }
diff --git a/example/wallet/lib/main.dart b/example/wallet/lib/main.dart
index bd4accaa..af37875c 100644
--- a/example/wallet/lib/main.dart
+++ b/example/wallet/lib/main.dart
@@ -3,11 +3,11 @@ import 'package:get_it_mixin/get_it_mixin.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/bottom_sheet_listener.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/bottom_sheet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/cosmos_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/evm_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/kadena_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/polkadot_service.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/chains/solana_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/cosmos_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/evm_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/kadena_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/polkadot_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/chain_services/solana_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/i_key_service.dart';
diff --git a/example/wallet/lib/pages/app_detail_page.dart b/example/wallet/lib/pages/app_detail_page.dart
index 1605964b..969fe1e4 100644
--- a/example/wallet/lib/pages/app_detail_page.dart
+++ b/example/wallet/lib/pages/app_detail_page.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/methods_utils.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/namespace_model_builder.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/custom_button.dart';
 
@@ -105,19 +105,18 @@ class AppDetailPageState extends State<AppDetailPage> {
         ),
       );
     }
-    final scheme = metadata?.redirect?.native ?? '';
     return Scaffold(
       appBar: AppBar(
         title: Text(metadata?.name ?? 'Unknown'),
         actions: [
           Visibility(
-            visible: scheme.isNotEmpty,
+            visible: metadata?.redirect?.native != null,
             child: IconButton(
               icon: const Icon(
                 Icons.open_in_new_rounded,
               ),
               onPressed: () {
-                DeepLinkHandler.goTo(scheme);
+                MethodsUtils.openApp(metadata);
               },
             ),
           )
diff --git a/example/wallet/lib/pages/apps_page.dart b/example/wallet/lib/pages/apps_page.dart
index 297d3a2a..2a84b170 100644
--- a/example/wallet/lib/pages/apps_page.dart
+++ b/example/wallet/lib/pages/apps_page.dart
@@ -38,7 +38,7 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
     //
     _registerListeners();
     // TODO web3Wallet.core.echo.register(firebaseAccessToken);
-    DeepLinkHandler.onLink.listen(_onFoundUri);
+    // DeepLinkHandler.onLink.listen(_onFoundUri);
     DeepLinkHandler.checkInitialLink();
   }
 
diff --git a/example/wallet/lib/utils/methods_utils.dart b/example/wallet/lib/utils/methods_utils.dart
new file mode 100644
index 00000000..e66a0c0a
--- /dev/null
+++ b/example/wallet/lib/utils/methods_utils.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
+import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
+import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
+import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_model.dart';
+import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_widget/wc_connection_widget.dart';
+import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/wc_request_widget.dart';
+
+class MethodsUtils {
+  static final web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
+
+  static void goBackToDapp(String topic, dynamic result) {
+    try {
+      if (result is String) {
+        final session = web3Wallet.sessions.get(topic);
+        openApp(session?.peer.metadata, onFail: ([error]) {
+          debugPrint('[SampleWallet] MethodsUtils: goBackToDapp $error');
+          goBackModal(
+            title: 'Success',
+            message: 'You can go back to ${session?.peer.metadata.name}',
+            success: true,
+          );
+        });
+      } else {
+        goBackModal(
+          title: 'Error',
+          message: result.toString(),
+          success: false,
+        );
+      }
+    } catch (e) {
+      debugPrint('[SampleWallet] MethodsUtils: goBackToDapp ${e.toString()}');
+    }
+  }
+
+  static Future<bool> requestApproval(
+    String text, {
+    String? title,
+    String? method,
+    String? chainId,
+    String? address,
+    required String transportType,
+    List<WCConnectionModel> extraModels = const [],
+  }) async {
+    final bottomSheetService = GetIt.I<IBottomSheetService>();
+    final WCBottomSheetResult rs = (await bottomSheetService.queueBottomSheet(
+          widget: WCRequestWidget(
+            child: WCConnectionWidget(
+              title: title ?? 'Approve Request',
+              info: [
+                WCConnectionModel(
+                  title: 'Method: $method\n'
+                      'Transport Type: ${transportType.toUpperCase()}\n'
+                      'Chain ID: $chainId\n'
+                      'Address: $address\n\n'
+                      'Message:',
+                  elements: [
+                    text,
+                  ],
+                ),
+                ...extraModels,
+              ],
+            ),
+          ),
+        )) ??
+        WCBottomSheetResult.reject;
+
+    return rs != WCBottomSheetResult.reject;
+  }
+
+  static void openApp(
+    PairingMetadata? metadata, {
+    int delay = 100,
+    Function([WalletConnectError? error])? onFail,
+  }) async {
+    await Future.delayed(Duration(milliseconds: delay));
+    DeepLinkHandler.waiting.value = false;
+    try {
+      await web3Wallet.redirectToDapp(metadata);
+    } on WalletConnectError catch (e) {
+      onFail?.call(e);
+    }
+  }
+
+  static void goBackModal({
+    String? title,
+    String? message,
+    bool success = true,
+  }) async {
+    DeepLinkHandler.waiting.value = false;
+    await GetIt.I<IBottomSheetService>().queueBottomSheet(
+      closeAfter: success ? 3 : 0,
+      widget: Container(
+        color: Colors.white,
+        height: 210.0,
+        width: double.infinity,
+        padding: const EdgeInsets.all(20.0),
+        child: Column(
+          children: [
+            Icon(
+              success ? Icons.check_circle_sharp : Icons.error_outline_sharp,
+              color: success ? Colors.green[100] : Colors.red[100],
+              size: 80.0,
+            ),
+            Text(
+              title ?? 'Connected',
+              style: StyleConstants.subtitleText.copyWith(
+                color: Colors.black,
+                fontSize: 18.0,
+              ),
+            ),
+            Text(message ?? 'You can go back to your dApp now'),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/example/wallet/pubspec.yaml b/example/wallet/pubspec.yaml
index b40d5079..c263ecf9 100644
--- a/example/wallet/pubspec.yaml
+++ b/example/wallet/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   get_it_mixin: ^4.0.0
   package_info_plus: ^7.0.0
   convert: ^3.0.1
-  url_launcher: ^6.2.2
+  # url_launcher: ^6.2.2
   
   # CHECK WEB SUPPORT
   kadena_dart_sdk: ^2.3.2
diff --git a/lib/apis/auth_api/auth_engine.dart b/lib/apis/auth_api/auth_engine.dart
index 926fb952..3f6e85b5 100644
--- a/lib/apis/auth_api/auth_engine.dart
+++ b/lib/apis/auth_api/auth_engine.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:event/event.dart';
 import 'package:walletconnect_flutter_v2/apis/auth_api/i_auth_engine.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/auth_client_events.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/auth_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/common_auth_models.dart';
@@ -117,7 +118,7 @@ class AuthEngine implements IAuthEngine {
     final int expiry = params.expiry ?? WalletConnectConstants.FIVE_MINUTES;
 
     await authKeys.set(
-      AuthConstants.AUTH_CLIENT_PUBLIC_KEY_NAME,
+      StringConstants.AUTH_CLIENT_PUBLIC_KEY_NAME,
       AuthPublicKey(publicKey: publicKey),
     );
 
@@ -399,8 +400,9 @@ class AuthEngine implements IAuthEngine {
 
   void _onAuthRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    TransportType transportType = TransportType.relay,
+  ]) async {
     try {
       final request = WcAuthRequestRequest.fromJson(payload.params);
 
@@ -425,6 +427,7 @@ class AuthEngine implements IAuthEngine {
           topic: topic,
           requester: request.requester,
           payloadParams: request.payloadParams,
+          transportType: request.transportType,
         ),
       );
     } on WalletConnectError catch (err) {
diff --git a/lib/apis/core/pairing/utils/pairing_models.dart b/lib/apis/core/pairing/utils/pairing_models.dart
index b4f9499d..9b5eb5b4 100644
--- a/lib/apis/core/pairing/utils/pairing_models.dart
+++ b/lib/apis/core/pairing/utils/pairing_models.dart
@@ -58,6 +58,7 @@ class Redirect with _$Redirect {
   const factory Redirect({
     String? native,
     String? universal,
+    @Default(false) bool linkMode,
   }) = _Redirect;
 
   factory Redirect.fromJson(Map<String, dynamic> json) =>
@@ -184,7 +185,7 @@ class ReceiverPublicKey with _$ReceiverPublicKey {
 
 class RegisteredFunction {
   String method;
-  Function(String, JsonRpcRequest) function;
+  Function(String, JsonRpcRequest, [TransportType]) function;
   ProtocolType type;
 
   RegisteredFunction({
diff --git a/lib/apis/core/pairing/utils/pairing_models.freezed.dart b/lib/apis/core/pairing/utils/pairing_models.freezed.dart
index e3d14d76..5defc747 100644
--- a/lib/apis/core/pairing/utils/pairing_models.freezed.dart
+++ b/lib/apis/core/pairing/utils/pairing_models.freezed.dart
@@ -561,6 +561,7 @@ Redirect _$RedirectFromJson(Map<String, dynamic> json) {
 mixin _$Redirect {
   String? get native => throw _privateConstructorUsedError;
   String? get universal => throw _privateConstructorUsedError;
+  bool get linkMode => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -573,7 +574,7 @@ abstract class $RedirectCopyWith<$Res> {
   factory $RedirectCopyWith(Redirect value, $Res Function(Redirect) then) =
       _$RedirectCopyWithImpl<$Res, Redirect>;
   @useResult
-  $Res call({String? native, String? universal});
+  $Res call({String? native, String? universal, bool linkMode});
 }
 
 /// @nodoc
@@ -591,6 +592,7 @@ class _$RedirectCopyWithImpl<$Res, $Val extends Redirect>
   $Res call({
     Object? native = freezed,
     Object? universal = freezed,
+    Object? linkMode = null,
   }) {
     return _then(_value.copyWith(
       native: freezed == native
@@ -601,6 +603,10 @@ class _$RedirectCopyWithImpl<$Res, $Val extends Redirect>
           ? _value.universal
           : universal // ignore: cast_nullable_to_non_nullable
               as String?,
+      linkMode: null == linkMode
+          ? _value.linkMode
+          : linkMode // ignore: cast_nullable_to_non_nullable
+              as bool,
     ) as $Val);
   }
 }
@@ -613,7 +619,7 @@ abstract class _$$RedirectImplCopyWith<$Res>
       __$$RedirectImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String? native, String? universal});
+  $Res call({String? native, String? universal, bool linkMode});
 }
 
 /// @nodoc
@@ -629,6 +635,7 @@ class __$$RedirectImplCopyWithImpl<$Res>
   $Res call({
     Object? native = freezed,
     Object? universal = freezed,
+    Object? linkMode = null,
   }) {
     return _then(_$RedirectImpl(
       native: freezed == native
@@ -639,6 +646,10 @@ class __$$RedirectImplCopyWithImpl<$Res>
           ? _value.universal
           : universal // ignore: cast_nullable_to_non_nullable
               as String?,
+      linkMode: null == linkMode
+          ? _value.linkMode
+          : linkMode // ignore: cast_nullable_to_non_nullable
+              as bool,
     ));
   }
 }
@@ -647,7 +658,7 @@ class __$$RedirectImplCopyWithImpl<$Res>
 
 @JsonSerializable()
 class _$RedirectImpl implements _Redirect {
-  const _$RedirectImpl({this.native, this.universal});
+  const _$RedirectImpl({this.native, this.universal, this.linkMode = false});
 
   factory _$RedirectImpl.fromJson(Map<String, dynamic> json) =>
       _$$RedirectImplFromJson(json);
@@ -656,10 +667,13 @@ class _$RedirectImpl implements _Redirect {
   final String? native;
   @override
   final String? universal;
+  @override
+  @JsonKey()
+  final bool linkMode;
 
   @override
   String toString() {
-    return 'Redirect(native: $native, universal: $universal)';
+    return 'Redirect(native: $native, universal: $universal, linkMode: $linkMode)';
   }
 
   @override
@@ -669,12 +683,14 @@ class _$RedirectImpl implements _Redirect {
             other is _$RedirectImpl &&
             (identical(other.native, native) || other.native == native) &&
             (identical(other.universal, universal) ||
-                other.universal == universal));
+                other.universal == universal) &&
+            (identical(other.linkMode, linkMode) ||
+                other.linkMode == linkMode));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, native, universal);
+  int get hashCode => Object.hash(runtimeType, native, universal, linkMode);
 
   @JsonKey(ignore: true)
   @override
@@ -691,8 +707,10 @@ class _$RedirectImpl implements _Redirect {
 }
 
 abstract class _Redirect implements Redirect {
-  const factory _Redirect({final String? native, final String? universal}) =
-      _$RedirectImpl;
+  const factory _Redirect(
+      {final String? native,
+      final String? universal,
+      final bool linkMode}) = _$RedirectImpl;
 
   factory _Redirect.fromJson(Map<String, dynamic> json) =
       _$RedirectImpl.fromJson;
@@ -702,6 +720,8 @@ abstract class _Redirect implements Redirect {
   @override
   String? get universal;
   @override
+  bool get linkMode;
+  @override
   @JsonKey(ignore: true)
   _$$RedirectImplCopyWith<_$RedirectImpl> get copyWith =>
       throw _privateConstructorUsedError;
diff --git a/lib/apis/core/pairing/utils/pairing_models.g.dart b/lib/apis/core/pairing/utils/pairing_models.g.dart
index 4e1e81f9..3a5bb709 100644
--- a/lib/apis/core/pairing/utils/pairing_models.g.dart
+++ b/lib/apis/core/pairing/utils/pairing_models.g.dart
@@ -67,12 +67,14 @@ _$RedirectImpl _$$RedirectImplFromJson(Map<String, dynamic> json) =>
     _$RedirectImpl(
       native: json['native'] as String?,
       universal: json['universal'] as String?,
+      linkMode: json['linkMode'] as bool? ?? false,
     );
 
 Map<String, dynamic> _$$RedirectImplToJson(_$RedirectImpl instance) =>
     <String, dynamic>{
       'native': instance.native,
       'universal': instance.universal,
+      'linkMode': instance.linkMode,
     };
 
 _$JsonRpcRecordImpl _$$JsonRpcRecordImplFromJson(Map<String, dynamic> json) =>
diff --git a/lib/apis/core/relay_client/relay_client_models.dart b/lib/apis/core/relay_client/relay_client_models.dart
index 0e69c1f5..85295da5 100644
--- a/lib/apis/core/relay_client/relay_client_models.dart
+++ b/lib/apis/core/relay_client/relay_client_models.dart
@@ -1,8 +1,17 @@
+import 'dart:convert';
+
 import 'package:event/event.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'relay_client_models.g.dart';
 
+enum TransportType {
+  relay,
+  linkMode;
+
+  bool get isLinkMode => this == linkMode;
+}
+
 @JsonSerializable()
 class Relay {
   final String protocol;
@@ -21,14 +30,25 @@ class Relay {
 class MessageEvent extends EventArgs {
   String topic;
   String message;
+  int publishedAt;
+  TransportType transportType;
 
   MessageEvent(
     this.topic,
     this.message,
+    this.publishedAt,
+    this.transportType,
   );
 
+  Map<String, dynamic> toJson() => {
+        'topic': topic,
+        'message': message,
+        'publishedAt': publishedAt,
+        'transportType': transportType.name,
+      };
+
   @override
-  String toString() => 'topic: $topic, message: $message';
+  String toString() => 'MessageEvent(${jsonEncode(toJson())})';
 }
 
 class ErrorEvent extends EventArgs {
diff --git a/lib/apis/sign_api/i_sessions.dart b/lib/apis/sign_api/i_sessions.dart
index df1616ad..d9f31298 100644
--- a/lib/apis/sign_api/i_sessions.dart
+++ b/lib/apis/sign_api/i_sessions.dart
@@ -1,3 +1,4 @@
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/i_generic_store.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/session_models.dart';
 
@@ -6,5 +7,6 @@ abstract class ISessions extends IGenericStore<SessionData> {
     String topic, {
     int? expiry,
     Map<String, Namespace>? namespaces,
+    TransportType? transportType,
   });
 }
diff --git a/lib/apis/sign_api/i_sign_client.dart b/lib/apis/sign_api/i_sign_client.dart
index 3aa30669..45d357c4 100644
--- a/lib/apis/sign_api/i_sign_client.dart
+++ b/lib/apis/sign_api/i_sign_client.dart
@@ -197,6 +197,7 @@ abstract class ISignClient {
 
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
+    String? walletUniversalLink,
     String? pairingTopic,
     List<List<String>>? methods,
   });
@@ -205,4 +206,10 @@ abstract class ISignClient {
     required Cacao cacao,
     required String projectId,
   });
+
+  Future<void> dispatchEnvelope(String url);
+
+  Future<bool> redirectToDapp(PairingMetadata? metadata);
+
+  Future<bool> redirectToWallet(PairingMetadata? metadata);
 }
diff --git a/lib/apis/sign_api/i_sign_engine_app.dart b/lib/apis/sign_api/i_sign_engine_app.dart
index ccfa481c..d81a9d52 100644
--- a/lib/apis/sign_api/i_sign_engine_app.dart
+++ b/lib/apis/sign_api/i_sign_engine_app.dart
@@ -59,7 +59,10 @@ abstract class ISignEngineApp extends ISignEngineCommon {
   // NEW 1-CA METHOD
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
+    String? walletUniversalLink,
     String? pairingTopic,
     List<List<String>>? methods,
   });
+
+  Future<bool> redirectToWallet(PairingMetadata? metadata);
 }
diff --git a/lib/apis/sign_api/i_sign_engine_common.dart b/lib/apis/sign_api/i_sign_engine_common.dart
index 0acd8f0d..26352bdd 100644
--- a/lib/apis/sign_api/i_sign_engine_common.dart
+++ b/lib/apis/sign_api/i_sign_engine_common.dart
@@ -54,4 +54,6 @@ abstract class ISignEngineCommon {
     required Cacao cacao,
     required String projectId,
   });
+
+  Future<void> dispatchEnvelope(String url);
 }
diff --git a/lib/apis/sign_api/i_sign_engine_wallet.dart b/lib/apis/sign_api/i_sign_engine_wallet.dart
index c2f125d6..5c996b47 100644
--- a/lib/apis/sign_api/i_sign_engine_wallet.dart
+++ b/lib/apis/sign_api/i_sign_engine_wallet.dart
@@ -115,4 +115,6 @@ abstract class ISignEngineWallet extends ISignEngineCommon {
   });
 
   Map<int, PendingSessionAuthRequest> getPendingSessionAuthRequests();
+
+  Future<bool> redirectToDapp(PairingMetadata? metadata);
 }
diff --git a/lib/apis/sign_api/models/auth/auth_client_events.dart b/lib/apis/sign_api/models/auth/auth_client_events.dart
index 3741e014..17008400 100644
--- a/lib/apis/sign_api/models/auth/auth_client_events.dart
+++ b/lib/apis/sign_api/models/auth/auth_client_events.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:event/event.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/json_rpc_error.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/auth_client_models.dart';
@@ -11,17 +12,19 @@ class AuthRequest extends EventArgs {
   final String topic;
   final AuthPayloadParams payloadParams;
   final ConnectionMetadata requester;
+  TransportType transportType;
 
   AuthRequest({
     required this.id,
     required this.topic,
     required this.payloadParams,
     required this.requester,
+    this.transportType = TransportType.relay,
   });
 
   @override
   String toString() {
-    return 'AuthRequest(id: $id, topic: $topic, payloadParams: $payloadParams, requester: $requester)';
+    return 'AuthRequest(id: $id, topic: $topic, payloadParams: $payloadParams, requester: $requester, transportType: $transportType)';
   }
 }
 
diff --git a/lib/apis/sign_api/models/auth/auth_client_models.dart b/lib/apis/sign_api/models/auth/auth_client_models.dart
index b1be6e8f..31cc24e0 100644
--- a/lib/apis/sign_api/models/auth/auth_client_models.dart
+++ b/lib/apis/sign_api/models/auth/auth_client_models.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/auth_client_events.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/common_auth_models.dart';
@@ -131,6 +132,7 @@ class PendingAuthRequest with _$PendingAuthRequest {
     required String pairingTopic,
     required ConnectionMetadata metadata,
     required CacaoRequestPayload cacaoPayload,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _PendingAuthRequest;
 
   factory PendingAuthRequest.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/apis/sign_api/models/auth/auth_client_models.freezed.dart b/lib/apis/sign_api/models/auth/auth_client_models.freezed.dart
index f06f8ba4..6c0a6d4e 100644
--- a/lib/apis/sign_api/models/auth/auth_client_models.freezed.dart
+++ b/lib/apis/sign_api/models/auth/auth_client_models.freezed.dart
@@ -412,6 +412,7 @@ mixin _$PendingAuthRequest {
   String get pairingTopic => throw _privateConstructorUsedError;
   ConnectionMetadata get metadata => throw _privateConstructorUsedError;
   CacaoRequestPayload get cacaoPayload => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -429,7 +430,8 @@ abstract class $PendingAuthRequestCopyWith<$Res> {
       {int id,
       String pairingTopic,
       ConnectionMetadata metadata,
-      CacaoRequestPayload cacaoPayload});
+      CacaoRequestPayload cacaoPayload,
+      TransportType transportType});
 
   $ConnectionMetadataCopyWith<$Res> get metadata;
   $CacaoRequestPayloadCopyWith<$Res> get cacaoPayload;
@@ -452,6 +454,7 @@ class _$PendingAuthRequestCopyWithImpl<$Res, $Val extends PendingAuthRequest>
     Object? pairingTopic = null,
     Object? metadata = null,
     Object? cacaoPayload = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -470,6 +473,10 @@ class _$PendingAuthRequestCopyWithImpl<$Res, $Val extends PendingAuthRequest>
           ? _value.cacaoPayload
           : cacaoPayload // ignore: cast_nullable_to_non_nullable
               as CacaoRequestPayload,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -502,7 +509,8 @@ abstract class _$$PendingAuthRequestImplCopyWith<$Res>
       {int id,
       String pairingTopic,
       ConnectionMetadata metadata,
-      CacaoRequestPayload cacaoPayload});
+      CacaoRequestPayload cacaoPayload,
+      TransportType transportType});
 
   @override
   $ConnectionMetadataCopyWith<$Res> get metadata;
@@ -525,6 +533,7 @@ class __$$PendingAuthRequestImplCopyWithImpl<$Res>
     Object? pairingTopic = null,
     Object? metadata = null,
     Object? cacaoPayload = null,
+    Object? transportType = null,
   }) {
     return _then(_$PendingAuthRequestImpl(
       id: null == id
@@ -543,6 +552,10 @@ class __$$PendingAuthRequestImplCopyWithImpl<$Res>
           ? _value.cacaoPayload
           : cacaoPayload // ignore: cast_nullable_to_non_nullable
               as CacaoRequestPayload,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -555,7 +568,8 @@ class _$PendingAuthRequestImpl implements _PendingAuthRequest {
       {required this.id,
       required this.pairingTopic,
       required this.metadata,
-      required this.cacaoPayload});
+      required this.cacaoPayload,
+      this.transportType = TransportType.relay});
 
   factory _$PendingAuthRequestImpl.fromJson(Map<String, dynamic> json) =>
       _$$PendingAuthRequestImplFromJson(json);
@@ -568,10 +582,13 @@ class _$PendingAuthRequestImpl implements _PendingAuthRequest {
   final ConnectionMetadata metadata;
   @override
   final CacaoRequestPayload cacaoPayload;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'PendingAuthRequest(id: $id, pairingTopic: $pairingTopic, metadata: $metadata, cacaoPayload: $cacaoPayload)';
+    return 'PendingAuthRequest(id: $id, pairingTopic: $pairingTopic, metadata: $metadata, cacaoPayload: $cacaoPayload, transportType: $transportType)';
   }
 
   @override
@@ -585,13 +602,15 @@ class _$PendingAuthRequestImpl implements _PendingAuthRequest {
             (identical(other.metadata, metadata) ||
                 other.metadata == metadata) &&
             (identical(other.cacaoPayload, cacaoPayload) ||
-                other.cacaoPayload == cacaoPayload));
+                other.cacaoPayload == cacaoPayload) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, id, pairingTopic, metadata, cacaoPayload);
+  int get hashCode => Object.hash(
+      runtimeType, id, pairingTopic, metadata, cacaoPayload, transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -610,11 +629,11 @@ class _$PendingAuthRequestImpl implements _PendingAuthRequest {
 
 abstract class _PendingAuthRequest implements PendingAuthRequest {
   const factory _PendingAuthRequest(
-          {required final int id,
-          required final String pairingTopic,
-          required final ConnectionMetadata metadata,
-          required final CacaoRequestPayload cacaoPayload}) =
-      _$PendingAuthRequestImpl;
+      {required final int id,
+      required final String pairingTopic,
+      required final ConnectionMetadata metadata,
+      required final CacaoRequestPayload cacaoPayload,
+      final TransportType transportType}) = _$PendingAuthRequestImpl;
 
   factory _PendingAuthRequest.fromJson(Map<String, dynamic> json) =
       _$PendingAuthRequestImpl.fromJson;
@@ -628,6 +647,8 @@ abstract class _PendingAuthRequest implements PendingAuthRequest {
   @override
   CacaoRequestPayload get cacaoPayload;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$PendingAuthRequestImplCopyWith<_$PendingAuthRequestImpl> get copyWith =>
       throw _privateConstructorUsedError;
diff --git a/lib/apis/sign_api/models/auth/auth_client_models.g.dart b/lib/apis/sign_api/models/auth/auth_client_models.g.dart
index 826e5c4e..e48bc535 100644
--- a/lib/apis/sign_api/models/auth/auth_client_models.g.dart
+++ b/lib/apis/sign_api/models/auth/auth_client_models.g.dart
@@ -60,6 +60,9 @@ _$PendingAuthRequestImpl _$$PendingAuthRequestImplFromJson(
           ConnectionMetadata.fromJson(json['metadata'] as Map<String, dynamic>),
       cacaoPayload: CacaoRequestPayload.fromJson(
           json['cacaoPayload'] as Map<String, dynamic>),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$PendingAuthRequestImplToJson(
@@ -69,4 +72,10 @@ Map<String, dynamic> _$$PendingAuthRequestImplToJson(
       'pairingTopic': instance.pairingTopic,
       'metadata': instance.metadata.toJson(),
       'cacaoPayload': instance.cacaoPayload.toJson(),
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
+
+const _$TransportTypeEnumMap = {
+  TransportType.relay: 'relay',
+  TransportType.linkMode: 'linkMode',
+};
diff --git a/lib/apis/sign_api/models/auth/session_auth_events.dart b/lib/apis/sign_api/models/auth/session_auth_events.dart
index 3c7cce32..88aff2bd 100644
--- a/lib/apis/sign_api/models/auth/session_auth_events.dart
+++ b/lib/apis/sign_api/models/auth/session_auth_events.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:event/event.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/models/verify_context.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/json_rpc_error.dart';
@@ -14,6 +15,7 @@ class SessionAuthRequest extends EventArgs {
   final String topic;
   final SessionAuthPayload authPayload;
   final ConnectionMetadata requester;
+  final TransportType transportType;
   final VerifyContext? verifyContext;
 
   SessionAuthRequest({
@@ -21,6 +23,7 @@ class SessionAuthRequest extends EventArgs {
     required this.topic,
     required this.authPayload,
     required this.requester,
+    this.transportType = TransportType.relay,
     this.verifyContext,
   });
 
@@ -29,7 +32,8 @@ class SessionAuthRequest extends EventArgs {
         'topic': topic,
         'authPayload': authPayload.toJson(),
         'requester': requester.toJson(),
-        'verifyContext': verifyContext?.toJson(),
+        'transportType': transportType.name,
+        if (verifyContext != null) 'verifyContext': verifyContext!.toJson(),
       };
 
   @override
diff --git a/lib/apis/sign_api/models/auth/session_auth_models.dart b/lib/apis/sign_api/models/auth/session_auth_models.dart
index 4bd920c0..3d613110 100644
--- a/lib/apis/sign_api/models/auth/session_auth_models.dart
+++ b/lib/apis/sign_api/models/auth/session_auth_models.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/models/verify_context.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 
@@ -110,6 +111,7 @@ class PendingSessionAuthRequest with _$PendingSessionAuthRequest {
     required int expiryTimestamp,
     required CacaoRequestPayload authPayload,
     required VerifyContext verifyContext,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _PendingSessionAuthRequest;
 
   factory PendingSessionAuthRequest.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/apis/sign_api/models/auth/session_auth_models.freezed.dart b/lib/apis/sign_api/models/auth/session_auth_models.freezed.dart
index c15f889a..df31a0db 100644
--- a/lib/apis/sign_api/models/auth/session_auth_models.freezed.dart
+++ b/lib/apis/sign_api/models/auth/session_auth_models.freezed.dart
@@ -848,6 +848,7 @@ mixin _$PendingSessionAuthRequest {
   int get expiryTimestamp => throw _privateConstructorUsedError;
   CacaoRequestPayload get authPayload => throw _privateConstructorUsedError;
   VerifyContext get verifyContext => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -867,7 +868,8 @@ abstract class $PendingSessionAuthRequestCopyWith<$Res> {
       ConnectionMetadata requester,
       int expiryTimestamp,
       CacaoRequestPayload authPayload,
-      VerifyContext verifyContext});
+      VerifyContext verifyContext,
+      TransportType transportType});
 
   $ConnectionMetadataCopyWith<$Res> get requester;
   $CacaoRequestPayloadCopyWith<$Res> get authPayload;
@@ -894,6 +896,7 @@ class _$PendingSessionAuthRequestCopyWithImpl<$Res,
     Object? expiryTimestamp = null,
     Object? authPayload = null,
     Object? verifyContext = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -920,6 +923,10 @@ class _$PendingSessionAuthRequestCopyWithImpl<$Res,
           ? _value.verifyContext
           : verifyContext // ignore: cast_nullable_to_non_nullable
               as VerifyContext,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -963,7 +970,8 @@ abstract class _$$PendingSessionAuthRequestImplCopyWith<$Res>
       ConnectionMetadata requester,
       int expiryTimestamp,
       CacaoRequestPayload authPayload,
-      VerifyContext verifyContext});
+      VerifyContext verifyContext,
+      TransportType transportType});
 
   @override
   $ConnectionMetadataCopyWith<$Res> get requester;
@@ -992,6 +1000,7 @@ class __$$PendingSessionAuthRequestImplCopyWithImpl<$Res>
     Object? expiryTimestamp = null,
     Object? authPayload = null,
     Object? verifyContext = null,
+    Object? transportType = null,
   }) {
     return _then(_$PendingSessionAuthRequestImpl(
       id: null == id
@@ -1018,6 +1027,10 @@ class __$$PendingSessionAuthRequestImplCopyWithImpl<$Res>
           ? _value.verifyContext
           : verifyContext // ignore: cast_nullable_to_non_nullable
               as VerifyContext,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -1032,7 +1045,8 @@ class _$PendingSessionAuthRequestImpl implements _PendingSessionAuthRequest {
       required this.requester,
       required this.expiryTimestamp,
       required this.authPayload,
-      required this.verifyContext});
+      required this.verifyContext,
+      this.transportType = TransportType.relay});
 
   factory _$PendingSessionAuthRequestImpl.fromJson(Map<String, dynamic> json) =>
       _$$PendingSessionAuthRequestImplFromJson(json);
@@ -1049,10 +1063,13 @@ class _$PendingSessionAuthRequestImpl implements _PendingSessionAuthRequest {
   final CacaoRequestPayload authPayload;
   @override
   final VerifyContext verifyContext;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'PendingSessionAuthRequest(id: $id, pairingTopic: $pairingTopic, requester: $requester, expiryTimestamp: $expiryTimestamp, authPayload: $authPayload, verifyContext: $verifyContext)';
+    return 'PendingSessionAuthRequest(id: $id, pairingTopic: $pairingTopic, requester: $requester, expiryTimestamp: $expiryTimestamp, authPayload: $authPayload, verifyContext: $verifyContext, transportType: $transportType)';
   }
 
   @override
@@ -1070,13 +1087,15 @@ class _$PendingSessionAuthRequestImpl implements _PendingSessionAuthRequest {
             (identical(other.authPayload, authPayload) ||
                 other.authPayload == authPayload) &&
             (identical(other.verifyContext, verifyContext) ||
-                other.verifyContext == verifyContext));
+                other.verifyContext == verifyContext) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, id, pairingTopic, requester,
-      expiryTimestamp, authPayload, verifyContext);
+      expiryTimestamp, authPayload, verifyContext, transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -1095,13 +1114,13 @@ class _$PendingSessionAuthRequestImpl implements _PendingSessionAuthRequest {
 
 abstract class _PendingSessionAuthRequest implements PendingSessionAuthRequest {
   const factory _PendingSessionAuthRequest(
-          {required final int id,
-          required final String pairingTopic,
-          required final ConnectionMetadata requester,
-          required final int expiryTimestamp,
-          required final CacaoRequestPayload authPayload,
-          required final VerifyContext verifyContext}) =
-      _$PendingSessionAuthRequestImpl;
+      {required final int id,
+      required final String pairingTopic,
+      required final ConnectionMetadata requester,
+      required final int expiryTimestamp,
+      required final CacaoRequestPayload authPayload,
+      required final VerifyContext verifyContext,
+      final TransportType transportType}) = _$PendingSessionAuthRequestImpl;
 
   factory _PendingSessionAuthRequest.fromJson(Map<String, dynamic> json) =
       _$PendingSessionAuthRequestImpl.fromJson;
@@ -1119,6 +1138,8 @@ abstract class _PendingSessionAuthRequest implements PendingSessionAuthRequest {
   @override
   VerifyContext get verifyContext;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$PendingSessionAuthRequestImplCopyWith<_$PendingSessionAuthRequestImpl>
       get copyWith => throw _privateConstructorUsedError;
diff --git a/lib/apis/sign_api/models/auth/session_auth_models.g.dart b/lib/apis/sign_api/models/auth/session_auth_models.g.dart
index d1ea250e..7b5a5abc 100644
--- a/lib/apis/sign_api/models/auth/session_auth_models.g.dart
+++ b/lib/apis/sign_api/models/auth/session_auth_models.g.dart
@@ -115,6 +115,9 @@ _$PendingSessionAuthRequestImpl _$$PendingSessionAuthRequestImplFromJson(
           json['authPayload'] as Map<String, dynamic>),
       verifyContext:
           VerifyContext.fromJson(json['verifyContext'] as Map<String, dynamic>),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$PendingSessionAuthRequestImplToJson(
@@ -126,4 +129,10 @@ Map<String, dynamic> _$$PendingSessionAuthRequestImplToJson(
       'expiryTimestamp': instance.expiryTimestamp,
       'authPayload': instance.authPayload.toJson(),
       'verifyContext': instance.verifyContext.toJson(),
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
+
+const _$TransportTypeEnumMap = {
+  TransportType.relay: 'relay',
+  TransportType.linkMode: 'linkMode',
+};
diff --git a/lib/apis/sign_api/models/json_rpc_models.dart b/lib/apis/sign_api/models/json_rpc_models.dart
index bc88c75f..76637e54 100644
--- a/lib/apis/sign_api/models/json_rpc_models.dart
+++ b/lib/apis/sign_api/models/json_rpc_models.dart
@@ -129,6 +129,7 @@ class WcSessionRequestRequest with _$WcSessionRequestRequest {
   const factory WcSessionRequestRequest({
     required String chainId,
     required SessionRequestParams request,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _WcSessionRequestRequest;
 
   factory WcSessionRequestRequest.fromJson(Map<String, dynamic> json) =>
@@ -179,6 +180,7 @@ class WcAuthRequestRequest with _$WcAuthRequestRequest {
   const factory WcAuthRequestRequest({
     required AuthPayloadParams payloadParams,
     required ConnectionMetadata requester,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _WcAuthRequestRequest;
 
   factory WcAuthRequestRequest.fromJson(Map<String, dynamic> json) =>
@@ -203,6 +205,7 @@ class WcSessionAuthRequestParams with _$WcSessionAuthRequestParams {
     required SessionAuthPayload authPayload,
     required ConnectionMetadata requester,
     required int expiryTimestamp,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _WcSessionAuthRequestParams;
 
   factory WcSessionAuthRequestParams.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/apis/sign_api/models/json_rpc_models.freezed.dart b/lib/apis/sign_api/models/json_rpc_models.freezed.dart
index 984d2422..4036903c 100644
--- a/lib/apis/sign_api/models/json_rpc_models.freezed.dart
+++ b/lib/apis/sign_api/models/json_rpc_models.freezed.dart
@@ -1756,6 +1756,7 @@ WcSessionRequestRequest _$WcSessionRequestRequestFromJson(
 mixin _$WcSessionRequestRequest {
   String get chainId => throw _privateConstructorUsedError;
   SessionRequestParams get request => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -1769,7 +1770,10 @@ abstract class $WcSessionRequestRequestCopyWith<$Res> {
           $Res Function(WcSessionRequestRequest) then) =
       _$WcSessionRequestRequestCopyWithImpl<$Res, WcSessionRequestRequest>;
   @useResult
-  $Res call({String chainId, SessionRequestParams request});
+  $Res call(
+      {String chainId,
+      SessionRequestParams request,
+      TransportType transportType});
 
   $SessionRequestParamsCopyWith<$Res> get request;
 }
@@ -1790,6 +1794,7 @@ class _$WcSessionRequestRequestCopyWithImpl<$Res,
   $Res call({
     Object? chainId = null,
     Object? request = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       chainId: null == chainId
@@ -1800,6 +1805,10 @@ class _$WcSessionRequestRequestCopyWithImpl<$Res,
           ? _value.request
           : request // ignore: cast_nullable_to_non_nullable
               as SessionRequestParams,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -1821,7 +1830,10 @@ abstract class _$$WcSessionRequestRequestImplCopyWith<$Res>
       __$$WcSessionRequestRequestImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String chainId, SessionRequestParams request});
+  $Res call(
+      {String chainId,
+      SessionRequestParams request,
+      TransportType transportType});
 
   @override
   $SessionRequestParamsCopyWith<$Res> get request;
@@ -1842,6 +1854,7 @@ class __$$WcSessionRequestRequestImplCopyWithImpl<$Res>
   $Res call({
     Object? chainId = null,
     Object? request = null,
+    Object? transportType = null,
   }) {
     return _then(_$WcSessionRequestRequestImpl(
       chainId: null == chainId
@@ -1852,6 +1865,10 @@ class __$$WcSessionRequestRequestImplCopyWithImpl<$Res>
           ? _value.request
           : request // ignore: cast_nullable_to_non_nullable
               as SessionRequestParams,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -1861,7 +1878,9 @@ class __$$WcSessionRequestRequestImplCopyWithImpl<$Res>
 @JsonSerializable()
 class _$WcSessionRequestRequestImpl implements _WcSessionRequestRequest {
   const _$WcSessionRequestRequestImpl(
-      {required this.chainId, required this.request});
+      {required this.chainId,
+      required this.request,
+      this.transportType = TransportType.relay});
 
   factory _$WcSessionRequestRequestImpl.fromJson(Map<String, dynamic> json) =>
       _$$WcSessionRequestRequestImplFromJson(json);
@@ -1870,10 +1889,13 @@ class _$WcSessionRequestRequestImpl implements _WcSessionRequestRequest {
   final String chainId;
   @override
   final SessionRequestParams request;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'WcSessionRequestRequest(chainId: $chainId, request: $request)';
+    return 'WcSessionRequestRequest(chainId: $chainId, request: $request, transportType: $transportType)';
   }
 
   @override
@@ -1882,12 +1904,14 @@ class _$WcSessionRequestRequestImpl implements _WcSessionRequestRequest {
         (other.runtimeType == runtimeType &&
             other is _$WcSessionRequestRequestImpl &&
             (identical(other.chainId, chainId) || other.chainId == chainId) &&
-            (identical(other.request, request) || other.request == request));
+            (identical(other.request, request) || other.request == request) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, chainId, request);
+  int get hashCode => Object.hash(runtimeType, chainId, request, transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -1906,9 +1930,9 @@ class _$WcSessionRequestRequestImpl implements _WcSessionRequestRequest {
 
 abstract class _WcSessionRequestRequest implements WcSessionRequestRequest {
   const factory _WcSessionRequestRequest(
-          {required final String chainId,
-          required final SessionRequestParams request}) =
-      _$WcSessionRequestRequestImpl;
+      {required final String chainId,
+      required final SessionRequestParams request,
+      final TransportType transportType}) = _$WcSessionRequestRequestImpl;
 
   factory _WcSessionRequestRequest.fromJson(Map<String, dynamic> json) =
       _$WcSessionRequestRequestImpl.fromJson;
@@ -1918,6 +1942,8 @@ abstract class _WcSessionRequestRequest implements WcSessionRequestRequest {
   @override
   SessionRequestParams get request;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$WcSessionRequestRequestImplCopyWith<_$WcSessionRequestRequestImpl>
       get copyWith => throw _privateConstructorUsedError;
@@ -2422,6 +2448,7 @@ WcAuthRequestRequest _$WcAuthRequestRequestFromJson(Map<String, dynamic> json) {
 mixin _$WcAuthRequestRequest {
   AuthPayloadParams get payloadParams => throw _privateConstructorUsedError;
   ConnectionMetadata get requester => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -2435,7 +2462,10 @@ abstract class $WcAuthRequestRequestCopyWith<$Res> {
           $Res Function(WcAuthRequestRequest) then) =
       _$WcAuthRequestRequestCopyWithImpl<$Res, WcAuthRequestRequest>;
   @useResult
-  $Res call({AuthPayloadParams payloadParams, ConnectionMetadata requester});
+  $Res call(
+      {AuthPayloadParams payloadParams,
+      ConnectionMetadata requester,
+      TransportType transportType});
 
   $AuthPayloadParamsCopyWith<$Res> get payloadParams;
   $ConnectionMetadataCopyWith<$Res> get requester;
@@ -2457,6 +2487,7 @@ class _$WcAuthRequestRequestCopyWithImpl<$Res,
   $Res call({
     Object? payloadParams = null,
     Object? requester = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       payloadParams: null == payloadParams
@@ -2467,6 +2498,10 @@ class _$WcAuthRequestRequestCopyWithImpl<$Res,
           ? _value.requester
           : requester // ignore: cast_nullable_to_non_nullable
               as ConnectionMetadata,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -2495,7 +2530,10 @@ abstract class _$$WcAuthRequestRequestImplCopyWith<$Res>
       __$$WcAuthRequestRequestImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({AuthPayloadParams payloadParams, ConnectionMetadata requester});
+  $Res call(
+      {AuthPayloadParams payloadParams,
+      ConnectionMetadata requester,
+      TransportType transportType});
 
   @override
   $AuthPayloadParamsCopyWith<$Res> get payloadParams;
@@ -2516,6 +2554,7 @@ class __$$WcAuthRequestRequestImplCopyWithImpl<$Res>
   $Res call({
     Object? payloadParams = null,
     Object? requester = null,
+    Object? transportType = null,
   }) {
     return _then(_$WcAuthRequestRequestImpl(
       payloadParams: null == payloadParams
@@ -2526,6 +2565,10 @@ class __$$WcAuthRequestRequestImplCopyWithImpl<$Res>
           ? _value.requester
           : requester // ignore: cast_nullable_to_non_nullable
               as ConnectionMetadata,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -2535,7 +2578,9 @@ class __$$WcAuthRequestRequestImplCopyWithImpl<$Res>
 @JsonSerializable()
 class _$WcAuthRequestRequestImpl implements _WcAuthRequestRequest {
   const _$WcAuthRequestRequestImpl(
-      {required this.payloadParams, required this.requester});
+      {required this.payloadParams,
+      required this.requester,
+      this.transportType = TransportType.relay});
 
   factory _$WcAuthRequestRequestImpl.fromJson(Map<String, dynamic> json) =>
       _$$WcAuthRequestRequestImplFromJson(json);
@@ -2544,10 +2589,13 @@ class _$WcAuthRequestRequestImpl implements _WcAuthRequestRequest {
   final AuthPayloadParams payloadParams;
   @override
   final ConnectionMetadata requester;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'WcAuthRequestRequest(payloadParams: $payloadParams, requester: $requester)';
+    return 'WcAuthRequestRequest(payloadParams: $payloadParams, requester: $requester, transportType: $transportType)';
   }
 
   @override
@@ -2558,12 +2606,15 @@ class _$WcAuthRequestRequestImpl implements _WcAuthRequestRequest {
             (identical(other.payloadParams, payloadParams) ||
                 other.payloadParams == payloadParams) &&
             (identical(other.requester, requester) ||
-                other.requester == requester));
+                other.requester == requester) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, payloadParams, requester);
+  int get hashCode =>
+      Object.hash(runtimeType, payloadParams, requester, transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -2583,9 +2634,9 @@ class _$WcAuthRequestRequestImpl implements _WcAuthRequestRequest {
 
 abstract class _WcAuthRequestRequest implements WcAuthRequestRequest {
   const factory _WcAuthRequestRequest(
-          {required final AuthPayloadParams payloadParams,
-          required final ConnectionMetadata requester}) =
-      _$WcAuthRequestRequestImpl;
+      {required final AuthPayloadParams payloadParams,
+      required final ConnectionMetadata requester,
+      final TransportType transportType}) = _$WcAuthRequestRequestImpl;
 
   factory _WcAuthRequestRequest.fromJson(Map<String, dynamic> json) =
       _$WcAuthRequestRequestImpl.fromJson;
@@ -2595,6 +2646,8 @@ abstract class _WcAuthRequestRequest implements WcAuthRequestRequest {
   @override
   ConnectionMetadata get requester;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$WcAuthRequestRequestImplCopyWith<_$WcAuthRequestRequestImpl>
       get copyWith => throw _privateConstructorUsedError;
@@ -2762,6 +2815,7 @@ mixin _$WcSessionAuthRequestParams {
   SessionAuthPayload get authPayload => throw _privateConstructorUsedError;
   ConnectionMetadata get requester => throw _privateConstructorUsedError;
   int get expiryTimestamp => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -2779,7 +2833,8 @@ abstract class $WcSessionAuthRequestParamsCopyWith<$Res> {
   $Res call(
       {SessionAuthPayload authPayload,
       ConnectionMetadata requester,
-      int expiryTimestamp});
+      int expiryTimestamp,
+      TransportType transportType});
 
   $SessionAuthPayloadCopyWith<$Res> get authPayload;
   $ConnectionMetadataCopyWith<$Res> get requester;
@@ -2802,6 +2857,7 @@ class _$WcSessionAuthRequestParamsCopyWithImpl<$Res,
     Object? authPayload = null,
     Object? requester = null,
     Object? expiryTimestamp = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       authPayload: null == authPayload
@@ -2816,6 +2872,10 @@ class _$WcSessionAuthRequestParamsCopyWithImpl<$Res,
           ? _value.expiryTimestamp
           : expiryTimestamp // ignore: cast_nullable_to_non_nullable
               as int,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -2848,7 +2908,8 @@ abstract class _$$WcSessionAuthRequestParamsImplCopyWith<$Res>
   $Res call(
       {SessionAuthPayload authPayload,
       ConnectionMetadata requester,
-      int expiryTimestamp});
+      int expiryTimestamp,
+      TransportType transportType});
 
   @override
   $SessionAuthPayloadCopyWith<$Res> get authPayload;
@@ -2872,6 +2933,7 @@ class __$$WcSessionAuthRequestParamsImplCopyWithImpl<$Res>
     Object? authPayload = null,
     Object? requester = null,
     Object? expiryTimestamp = null,
+    Object? transportType = null,
   }) {
     return _then(_$WcSessionAuthRequestParamsImpl(
       authPayload: null == authPayload
@@ -2886,6 +2948,10 @@ class __$$WcSessionAuthRequestParamsImplCopyWithImpl<$Res>
           ? _value.expiryTimestamp
           : expiryTimestamp // ignore: cast_nullable_to_non_nullable
               as int,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -2897,7 +2963,8 @@ class _$WcSessionAuthRequestParamsImpl implements _WcSessionAuthRequestParams {
   const _$WcSessionAuthRequestParamsImpl(
       {required this.authPayload,
       required this.requester,
-      required this.expiryTimestamp});
+      required this.expiryTimestamp,
+      this.transportType = TransportType.relay});
 
   factory _$WcSessionAuthRequestParamsImpl.fromJson(
           Map<String, dynamic> json) =>
@@ -2909,10 +2976,13 @@ class _$WcSessionAuthRequestParamsImpl implements _WcSessionAuthRequestParams {
   final ConnectionMetadata requester;
   @override
   final int expiryTimestamp;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'WcSessionAuthRequestParams(authPayload: $authPayload, requester: $requester, expiryTimestamp: $expiryTimestamp)';
+    return 'WcSessionAuthRequestParams(authPayload: $authPayload, requester: $requester, expiryTimestamp: $expiryTimestamp, transportType: $transportType)';
   }
 
   @override
@@ -2925,13 +2995,15 @@ class _$WcSessionAuthRequestParamsImpl implements _WcSessionAuthRequestParams {
             (identical(other.requester, requester) ||
                 other.requester == requester) &&
             (identical(other.expiryTimestamp, expiryTimestamp) ||
-                other.expiryTimestamp == expiryTimestamp));
+                other.expiryTimestamp == expiryTimestamp) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, authPayload, requester, expiryTimestamp);
+  int get hashCode => Object.hash(
+      runtimeType, authPayload, requester, expiryTimestamp, transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -2953,7 +3025,8 @@ abstract class _WcSessionAuthRequestParams
   const factory _WcSessionAuthRequestParams(
       {required final SessionAuthPayload authPayload,
       required final ConnectionMetadata requester,
-      required final int expiryTimestamp}) = _$WcSessionAuthRequestParamsImpl;
+      required final int expiryTimestamp,
+      final TransportType transportType}) = _$WcSessionAuthRequestParamsImpl;
 
   factory _WcSessionAuthRequestParams.fromJson(Map<String, dynamic> json) =
       _$WcSessionAuthRequestParamsImpl.fromJson;
@@ -2965,6 +3038,8 @@ abstract class _WcSessionAuthRequestParams
   @override
   int get expiryTimestamp;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$WcSessionAuthRequestParamsImplCopyWith<_$WcSessionAuthRequestParamsImpl>
       get copyWith => throw _privateConstructorUsedError;
diff --git a/lib/apis/sign_api/models/json_rpc_models.g.dart b/lib/apis/sign_api/models/json_rpc_models.g.dart
index fe4ad4f6..cdcc26eb 100644
--- a/lib/apis/sign_api/models/json_rpc_models.g.dart
+++ b/lib/apis/sign_api/models/json_rpc_models.g.dart
@@ -225,6 +225,9 @@ _$WcSessionRequestRequestImpl _$$WcSessionRequestRequestImplFromJson(
       chainId: json['chainId'] as String,
       request: SessionRequestParams.fromJson(
           json['request'] as Map<String, dynamic>),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$WcSessionRequestRequestImplToJson(
@@ -232,8 +235,14 @@ Map<String, dynamic> _$$WcSessionRequestRequestImplToJson(
     <String, dynamic>{
       'chainId': instance.chainId,
       'request': instance.request.toJson(),
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
 
+const _$TransportTypeEnumMap = {
+  TransportType.relay: 'relay',
+  TransportType.linkMode: 'linkMode',
+};
+
 _$SessionRequestParamsImpl _$$SessionRequestParamsImplFromJson(
         Map<String, dynamic> json) =>
     _$SessionRequestParamsImpl(
@@ -283,6 +292,9 @@ _$WcAuthRequestRequestImpl _$$WcAuthRequestRequestImplFromJson(
           json['payloadParams'] as Map<String, dynamic>),
       requester: ConnectionMetadata.fromJson(
           json['requester'] as Map<String, dynamic>),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$WcAuthRequestRequestImplToJson(
@@ -290,6 +302,7 @@ Map<String, dynamic> _$$WcAuthRequestRequestImplToJson(
     <String, dynamic>{
       'payloadParams': instance.payloadParams.toJson(),
       'requester': instance.requester.toJson(),
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
 
 _$WcAuthRequestResultImpl _$$WcAuthRequestResultImplFromJson(
@@ -312,6 +325,9 @@ _$WcSessionAuthRequestParamsImpl _$$WcSessionAuthRequestParamsImplFromJson(
       requester: ConnectionMetadata.fromJson(
           json['requester'] as Map<String, dynamic>),
       expiryTimestamp: (json['expiryTimestamp'] as num).toInt(),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$WcSessionAuthRequestParamsImplToJson(
@@ -320,6 +336,7 @@ Map<String, dynamic> _$$WcSessionAuthRequestParamsImplToJson(
       'authPayload': instance.authPayload.toJson(),
       'requester': instance.requester.toJson(),
       'expiryTimestamp': instance.expiryTimestamp,
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
 
 _$WcSessionAuthRequestResultImpl _$$WcSessionAuthRequestResultImplFromJson(
diff --git a/lib/apis/sign_api/models/session_models.dart b/lib/apis/sign_api/models/session_models.dart
index 77d0f17e..683a707b 100644
--- a/lib/apis/sign_api/models/session_models.dart
+++ b/lib/apis/sign_api/models/session_models.dart
@@ -4,6 +4,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/models/verify_context.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/common_auth_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/proposal_models.dart';
 
 part 'session_models.g.dart';
@@ -59,11 +60,13 @@ class SessionData with _$SessionData {
     required bool acknowledged,
     required String controller,
     required Map<String, Namespace> namespaces,
+    required ConnectionMetadata self,
+    required ConnectionMetadata peer,
     Map<String, RequiredNamespace>? requiredNamespaces,
     Map<String, RequiredNamespace>? optionalNamespaces,
     Map<String, String>? sessionProperties,
-    required ConnectionMetadata self,
-    required ConnectionMetadata peer,
+    List<Cacao>? authentication,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _SessionData;
 
   factory SessionData.fromJson(Map<String, dynamic> json) =>
@@ -80,6 +83,7 @@ class SessionRequest with _$SessionRequest {
     required String chainId,
     required dynamic params,
     required VerifyContext verifyContext,
+    @Default(TransportType.relay) TransportType transportType,
   }) = _SessionRequest;
 
   factory SessionRequest.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/apis/sign_api/models/session_models.freezed.dart b/lib/apis/sign_api/models/session_models.freezed.dart
index 7da892aa..acfadb02 100644
--- a/lib/apis/sign_api/models/session_models.freezed.dart
+++ b/lib/apis/sign_api/models/session_models.freezed.dart
@@ -261,14 +261,16 @@ mixin _$SessionData {
   bool get acknowledged => throw _privateConstructorUsedError;
   String get controller => throw _privateConstructorUsedError;
   Map<String, Namespace> get namespaces => throw _privateConstructorUsedError;
+  ConnectionMetadata get self => throw _privateConstructorUsedError;
+  ConnectionMetadata get peer => throw _privateConstructorUsedError;
   Map<String, RequiredNamespace>? get requiredNamespaces =>
       throw _privateConstructorUsedError;
   Map<String, RequiredNamespace>? get optionalNamespaces =>
       throw _privateConstructorUsedError;
   Map<String, String>? get sessionProperties =>
       throw _privateConstructorUsedError;
-  ConnectionMetadata get self => throw _privateConstructorUsedError;
-  ConnectionMetadata get peer => throw _privateConstructorUsedError;
+  List<Cacao>? get authentication => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -290,11 +292,13 @@ abstract class $SessionDataCopyWith<$Res> {
       bool acknowledged,
       String controller,
       Map<String, Namespace> namespaces,
+      ConnectionMetadata self,
+      ConnectionMetadata peer,
       Map<String, RequiredNamespace>? requiredNamespaces,
       Map<String, RequiredNamespace>? optionalNamespaces,
       Map<String, String>? sessionProperties,
-      ConnectionMetadata self,
-      ConnectionMetadata peer});
+      List<Cacao>? authentication,
+      TransportType transportType});
 
   $ConnectionMetadataCopyWith<$Res> get self;
   $ConnectionMetadataCopyWith<$Res> get peer;
@@ -320,11 +324,13 @@ class _$SessionDataCopyWithImpl<$Res, $Val extends SessionData>
     Object? acknowledged = null,
     Object? controller = null,
     Object? namespaces = null,
+    Object? self = null,
+    Object? peer = null,
     Object? requiredNamespaces = freezed,
     Object? optionalNamespaces = freezed,
     Object? sessionProperties = freezed,
-    Object? self = null,
-    Object? peer = null,
+    Object? authentication = freezed,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       topic: null == topic
@@ -355,6 +361,14 @@ class _$SessionDataCopyWithImpl<$Res, $Val extends SessionData>
           ? _value.namespaces
           : namespaces // ignore: cast_nullable_to_non_nullable
               as Map<String, Namespace>,
+      self: null == self
+          ? _value.self
+          : self // ignore: cast_nullable_to_non_nullable
+              as ConnectionMetadata,
+      peer: null == peer
+          ? _value.peer
+          : peer // ignore: cast_nullable_to_non_nullable
+              as ConnectionMetadata,
       requiredNamespaces: freezed == requiredNamespaces
           ? _value.requiredNamespaces
           : requiredNamespaces // ignore: cast_nullable_to_non_nullable
@@ -367,14 +381,14 @@ class _$SessionDataCopyWithImpl<$Res, $Val extends SessionData>
           ? _value.sessionProperties
           : sessionProperties // ignore: cast_nullable_to_non_nullable
               as Map<String, String>?,
-      self: null == self
-          ? _value.self
-          : self // ignore: cast_nullable_to_non_nullable
-              as ConnectionMetadata,
-      peer: null == peer
-          ? _value.peer
-          : peer // ignore: cast_nullable_to_non_nullable
-              as ConnectionMetadata,
+      authentication: freezed == authentication
+          ? _value.authentication
+          : authentication // ignore: cast_nullable_to_non_nullable
+              as List<Cacao>?,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -411,11 +425,13 @@ abstract class _$$SessionDataImplCopyWith<$Res>
       bool acknowledged,
       String controller,
       Map<String, Namespace> namespaces,
+      ConnectionMetadata self,
+      ConnectionMetadata peer,
       Map<String, RequiredNamespace>? requiredNamespaces,
       Map<String, RequiredNamespace>? optionalNamespaces,
       Map<String, String>? sessionProperties,
-      ConnectionMetadata self,
-      ConnectionMetadata peer});
+      List<Cacao>? authentication,
+      TransportType transportType});
 
   @override
   $ConnectionMetadataCopyWith<$Res> get self;
@@ -441,11 +457,13 @@ class __$$SessionDataImplCopyWithImpl<$Res>
     Object? acknowledged = null,
     Object? controller = null,
     Object? namespaces = null,
+    Object? self = null,
+    Object? peer = null,
     Object? requiredNamespaces = freezed,
     Object? optionalNamespaces = freezed,
     Object? sessionProperties = freezed,
-    Object? self = null,
-    Object? peer = null,
+    Object? authentication = freezed,
+    Object? transportType = null,
   }) {
     return _then(_$SessionDataImpl(
       topic: null == topic
@@ -476,6 +494,14 @@ class __$$SessionDataImplCopyWithImpl<$Res>
           ? _value._namespaces
           : namespaces // ignore: cast_nullable_to_non_nullable
               as Map<String, Namespace>,
+      self: null == self
+          ? _value.self
+          : self // ignore: cast_nullable_to_non_nullable
+              as ConnectionMetadata,
+      peer: null == peer
+          ? _value.peer
+          : peer // ignore: cast_nullable_to_non_nullable
+              as ConnectionMetadata,
       requiredNamespaces: freezed == requiredNamespaces
           ? _value._requiredNamespaces
           : requiredNamespaces // ignore: cast_nullable_to_non_nullable
@@ -488,14 +514,14 @@ class __$$SessionDataImplCopyWithImpl<$Res>
           ? _value._sessionProperties
           : sessionProperties // ignore: cast_nullable_to_non_nullable
               as Map<String, String>?,
-      self: null == self
-          ? _value.self
-          : self // ignore: cast_nullable_to_non_nullable
-              as ConnectionMetadata,
-      peer: null == peer
-          ? _value.peer
-          : peer // ignore: cast_nullable_to_non_nullable
-              as ConnectionMetadata,
+      authentication: freezed == authentication
+          ? _value._authentication
+          : authentication // ignore: cast_nullable_to_non_nullable
+              as List<Cacao>?,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -512,15 +538,18 @@ class _$SessionDataImpl implements _SessionData {
       required this.acknowledged,
       required this.controller,
       required final Map<String, Namespace> namespaces,
+      required this.self,
+      required this.peer,
       final Map<String, RequiredNamespace>? requiredNamespaces,
       final Map<String, RequiredNamespace>? optionalNamespaces,
       final Map<String, String>? sessionProperties,
-      required this.self,
-      required this.peer})
+      final List<Cacao>? authentication,
+      this.transportType = TransportType.relay})
       : _namespaces = namespaces,
         _requiredNamespaces = requiredNamespaces,
         _optionalNamespaces = optionalNamespaces,
-        _sessionProperties = sessionProperties;
+        _sessionProperties = sessionProperties,
+        _authentication = authentication;
 
   factory _$SessionDataImpl.fromJson(Map<String, dynamic> json) =>
       _$$SessionDataImplFromJson(json);
@@ -545,6 +574,10 @@ class _$SessionDataImpl implements _SessionData {
     return EqualUnmodifiableMapView(_namespaces);
   }
 
+  @override
+  final ConnectionMetadata self;
+  @override
+  final ConnectionMetadata peer;
   final Map<String, RequiredNamespace>? _requiredNamespaces;
   @override
   Map<String, RequiredNamespace>? get requiredNamespaces {
@@ -578,14 +611,23 @@ class _$SessionDataImpl implements _SessionData {
     return EqualUnmodifiableMapView(value);
   }
 
+  final List<Cacao>? _authentication;
   @override
-  final ConnectionMetadata self;
+  List<Cacao>? get authentication {
+    final value = _authentication;
+    if (value == null) return null;
+    if (_authentication is EqualUnmodifiableListView) return _authentication;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
   @override
-  final ConnectionMetadata peer;
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'SessionData(topic: $topic, pairingTopic: $pairingTopic, relay: $relay, expiry: $expiry, acknowledged: $acknowledged, controller: $controller, namespaces: $namespaces, requiredNamespaces: $requiredNamespaces, optionalNamespaces: $optionalNamespaces, sessionProperties: $sessionProperties, self: $self, peer: $peer)';
+    return 'SessionData(topic: $topic, pairingTopic: $pairingTopic, relay: $relay, expiry: $expiry, acknowledged: $acknowledged, controller: $controller, namespaces: $namespaces, self: $self, peer: $peer, requiredNamespaces: $requiredNamespaces, optionalNamespaces: $optionalNamespaces, sessionProperties: $sessionProperties, authentication: $authentication, transportType: $transportType)';
   }
 
   @override
@@ -604,14 +646,18 @@ class _$SessionDataImpl implements _SessionData {
                 other.controller == controller) &&
             const DeepCollectionEquality()
                 .equals(other._namespaces, _namespaces) &&
+            (identical(other.self, self) || other.self == self) &&
+            (identical(other.peer, peer) || other.peer == peer) &&
             const DeepCollectionEquality()
                 .equals(other._requiredNamespaces, _requiredNamespaces) &&
             const DeepCollectionEquality()
                 .equals(other._optionalNamespaces, _optionalNamespaces) &&
             const DeepCollectionEquality()
                 .equals(other._sessionProperties, _sessionProperties) &&
-            (identical(other.self, self) || other.self == self) &&
-            (identical(other.peer, peer) || other.peer == peer));
+            const DeepCollectionEquality()
+                .equals(other._authentication, _authentication) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
@@ -625,11 +671,13 @@ class _$SessionDataImpl implements _SessionData {
       acknowledged,
       controller,
       const DeepCollectionEquality().hash(_namespaces),
+      self,
+      peer,
       const DeepCollectionEquality().hash(_requiredNamespaces),
       const DeepCollectionEquality().hash(_optionalNamespaces),
       const DeepCollectionEquality().hash(_sessionProperties),
-      self,
-      peer);
+      const DeepCollectionEquality().hash(_authentication),
+      transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -654,11 +702,13 @@ abstract class _SessionData implements SessionData {
       required final bool acknowledged,
       required final String controller,
       required final Map<String, Namespace> namespaces,
+      required final ConnectionMetadata self,
+      required final ConnectionMetadata peer,
       final Map<String, RequiredNamespace>? requiredNamespaces,
       final Map<String, RequiredNamespace>? optionalNamespaces,
       final Map<String, String>? sessionProperties,
-      required final ConnectionMetadata self,
-      required final ConnectionMetadata peer}) = _$SessionDataImpl;
+      final List<Cacao>? authentication,
+      final TransportType transportType}) = _$SessionDataImpl;
 
   factory _SessionData.fromJson(Map<String, dynamic> json) =
       _$SessionDataImpl.fromJson;
@@ -678,15 +728,19 @@ abstract class _SessionData implements SessionData {
   @override
   Map<String, Namespace> get namespaces;
   @override
+  ConnectionMetadata get self;
+  @override
+  ConnectionMetadata get peer;
+  @override
   Map<String, RequiredNamespace>? get requiredNamespaces;
   @override
   Map<String, RequiredNamespace>? get optionalNamespaces;
   @override
   Map<String, String>? get sessionProperties;
   @override
-  ConnectionMetadata get self;
+  List<Cacao>? get authentication;
   @override
-  ConnectionMetadata get peer;
+  TransportType get transportType;
   @override
   @JsonKey(ignore: true)
   _$$SessionDataImplCopyWith<_$SessionDataImpl> get copyWith =>
@@ -705,6 +759,7 @@ mixin _$SessionRequest {
   String get chainId => throw _privateConstructorUsedError;
   dynamic get params => throw _privateConstructorUsedError;
   VerifyContext get verifyContext => throw _privateConstructorUsedError;
+  TransportType get transportType => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -724,7 +779,8 @@ abstract class $SessionRequestCopyWith<$Res> {
       String method,
       String chainId,
       dynamic params,
-      VerifyContext verifyContext});
+      VerifyContext verifyContext,
+      TransportType transportType});
 
   $VerifyContextCopyWith<$Res> get verifyContext;
 }
@@ -748,6 +804,7 @@ class _$SessionRequestCopyWithImpl<$Res, $Val extends SessionRequest>
     Object? chainId = null,
     Object? params = freezed,
     Object? verifyContext = null,
+    Object? transportType = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -774,6 +831,10 @@ class _$SessionRequestCopyWithImpl<$Res, $Val extends SessionRequest>
           ? _value.verifyContext
           : verifyContext // ignore: cast_nullable_to_non_nullable
               as VerifyContext,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ) as $Val);
   }
 
@@ -800,7 +861,8 @@ abstract class _$$SessionRequestImplCopyWith<$Res>
       String method,
       String chainId,
       dynamic params,
-      VerifyContext verifyContext});
+      VerifyContext verifyContext,
+      TransportType transportType});
 
   @override
   $VerifyContextCopyWith<$Res> get verifyContext;
@@ -823,6 +885,7 @@ class __$$SessionRequestImplCopyWithImpl<$Res>
     Object? chainId = null,
     Object? params = freezed,
     Object? verifyContext = null,
+    Object? transportType = null,
   }) {
     return _then(_$SessionRequestImpl(
       id: null == id
@@ -849,6 +912,10 @@ class __$$SessionRequestImplCopyWithImpl<$Res>
           ? _value.verifyContext
           : verifyContext // ignore: cast_nullable_to_non_nullable
               as VerifyContext,
+      transportType: null == transportType
+          ? _value.transportType
+          : transportType // ignore: cast_nullable_to_non_nullable
+              as TransportType,
     ));
   }
 }
@@ -863,7 +930,8 @@ class _$SessionRequestImpl implements _SessionRequest {
       required this.method,
       required this.chainId,
       required this.params,
-      required this.verifyContext});
+      required this.verifyContext,
+      this.transportType = TransportType.relay});
 
   factory _$SessionRequestImpl.fromJson(Map<String, dynamic> json) =>
       _$$SessionRequestImplFromJson(json);
@@ -880,10 +948,13 @@ class _$SessionRequestImpl implements _SessionRequest {
   final dynamic params;
   @override
   final VerifyContext verifyContext;
+  @override
+  @JsonKey()
+  final TransportType transportType;
 
   @override
   String toString() {
-    return 'SessionRequest(id: $id, topic: $topic, method: $method, chainId: $chainId, params: $params, verifyContext: $verifyContext)';
+    return 'SessionRequest(id: $id, topic: $topic, method: $method, chainId: $chainId, params: $params, verifyContext: $verifyContext, transportType: $transportType)';
   }
 
   @override
@@ -897,13 +968,22 @@ class _$SessionRequestImpl implements _SessionRequest {
             (identical(other.chainId, chainId) || other.chainId == chainId) &&
             const DeepCollectionEquality().equals(other.params, params) &&
             (identical(other.verifyContext, verifyContext) ||
-                other.verifyContext == verifyContext));
+                other.verifyContext == verifyContext) &&
+            (identical(other.transportType, transportType) ||
+                other.transportType == transportType));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, id, topic, method, chainId,
-      const DeepCollectionEquality().hash(params), verifyContext);
+  int get hashCode => Object.hash(
+      runtimeType,
+      id,
+      topic,
+      method,
+      chainId,
+      const DeepCollectionEquality().hash(params),
+      verifyContext,
+      transportType);
 
   @JsonKey(ignore: true)
   @override
@@ -927,7 +1007,8 @@ abstract class _SessionRequest implements SessionRequest {
       required final String method,
       required final String chainId,
       required final dynamic params,
-      required final VerifyContext verifyContext}) = _$SessionRequestImpl;
+      required final VerifyContext verifyContext,
+      final TransportType transportType}) = _$SessionRequestImpl;
 
   factory _SessionRequest.fromJson(Map<String, dynamic> json) =
       _$SessionRequestImpl.fromJson;
@@ -945,6 +1026,8 @@ abstract class _SessionRequest implements SessionRequest {
   @override
   VerifyContext get verifyContext;
   @override
+  TransportType get transportType;
+  @override
   @JsonKey(ignore: true)
   _$$SessionRequestImplCopyWith<_$SessionRequestImpl> get copyWith =>
       throw _privateConstructorUsedError;
diff --git a/lib/apis/sign_api/models/session_models.g.dart b/lib/apis/sign_api/models/session_models.g.dart
index fb0c2596..1f192c1e 100644
--- a/lib/apis/sign_api/models/session_models.g.dart
+++ b/lib/apis/sign_api/models/session_models.g.dart
@@ -45,6 +45,8 @@ _$SessionDataImpl _$$SessionDataImplFromJson(Map<String, dynamic> json) =>
       namespaces: (json['namespaces'] as Map<String, dynamic>).map(
         (k, e) => MapEntry(k, Namespace.fromJson(e as Map<String, dynamic>)),
       ),
+      self: ConnectionMetadata.fromJson(json['self'] as Map<String, dynamic>),
+      peer: ConnectionMetadata.fromJson(json['peer'] as Map<String, dynamic>),
       requiredNamespaces:
           (json['requiredNamespaces'] as Map<String, dynamic>?)?.map(
         (k, e) =>
@@ -59,8 +61,12 @@ _$SessionDataImpl _$$SessionDataImplFromJson(Map<String, dynamic> json) =>
           (json['sessionProperties'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       ),
-      self: ConnectionMetadata.fromJson(json['self'] as Map<String, dynamic>),
-      peer: ConnectionMetadata.fromJson(json['peer'] as Map<String, dynamic>),
+      authentication: (json['authentication'] as List<dynamic>?)
+          ?.map((e) => Cacao.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$SessionDataImplToJson(_$SessionDataImpl instance) {
@@ -72,6 +78,8 @@ Map<String, dynamic> _$$SessionDataImplToJson(_$SessionDataImpl instance) {
     'acknowledged': instance.acknowledged,
     'controller': instance.controller,
     'namespaces': instance.namespaces.map((k, e) => MapEntry(k, e.toJson())),
+    'self': instance.self.toJson(),
+    'peer': instance.peer.toJson(),
   };
 
   void writeNotNull(String key, dynamic value) {
@@ -85,11 +93,17 @@ Map<String, dynamic> _$$SessionDataImplToJson(_$SessionDataImpl instance) {
   writeNotNull('optionalNamespaces',
       instance.optionalNamespaces?.map((k, e) => MapEntry(k, e.toJson())));
   writeNotNull('sessionProperties', instance.sessionProperties);
-  val['self'] = instance.self.toJson();
-  val['peer'] = instance.peer.toJson();
+  writeNotNull('authentication',
+      instance.authentication?.map((e) => e.toJson()).toList());
+  val['transportType'] = _$TransportTypeEnumMap[instance.transportType]!;
   return val;
 }
 
+const _$TransportTypeEnumMap = {
+  TransportType.relay: 'relay',
+  TransportType.linkMode: 'linkMode',
+};
+
 _$SessionRequestImpl _$$SessionRequestImplFromJson(Map<String, dynamic> json) =>
     _$SessionRequestImpl(
       id: (json['id'] as num).toInt(),
@@ -99,6 +113,9 @@ _$SessionRequestImpl _$$SessionRequestImplFromJson(Map<String, dynamic> json) =>
       params: json['params'],
       verifyContext:
           VerifyContext.fromJson(json['verifyContext'] as Map<String, dynamic>),
+      transportType:
+          $enumDecodeNullable(_$TransportTypeEnumMap, json['transportType']) ??
+              TransportType.relay,
     );
 
 Map<String, dynamic> _$$SessionRequestImplToJson(
@@ -110,4 +127,5 @@ Map<String, dynamic> _$$SessionRequestImplToJson(
       'chainId': instance.chainId,
       'params': instance.params,
       'verifyContext': instance.verifyContext.toJson(),
+      'transportType': _$TransportTypeEnumMap[instance.transportType]!,
     };
diff --git a/lib/apis/sign_api/models/sign_client_events.dart b/lib/apis/sign_api/models/sign_client_events.dart
index c2e49a97..f8c31e78 100644
--- a/lib/apis/sign_api/models/sign_client_events.dart
+++ b/lib/apis/sign_api/models/sign_client_events.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:event/event.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/models/verify_context.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/proposal_models.dart';
@@ -134,6 +135,7 @@ class SessionRequestEvent extends EventArgs {
   String method;
   String chainId;
   dynamic params;
+  TransportType transportType;
 
   SessionRequestEvent(
     this.id,
@@ -141,23 +143,32 @@ class SessionRequestEvent extends EventArgs {
     this.method,
     this.chainId,
     this.params,
+    this.transportType,
   );
 
-  factory SessionRequestEvent.fromSessionRequest(
-    SessionRequest request,
-  ) {
+  factory SessionRequestEvent.fromSessionRequest(SessionRequest request) {
     return SessionRequestEvent(
       request.id,
       request.topic,
       request.method,
       request.chainId,
       request.params,
+      request.transportType,
     );
   }
 
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'topic': topic,
+        'method': method,
+        'chainId': chainId,
+        'params': params,
+        'transportType': transportType.name,
+      };
+
   @override
   String toString() {
-    return 'SessionRequestEvent(id: $id, topic: $topic, method: $method, chainId: $chainId, params: $params)';
+    return 'SessionRequestEvent(${jsonEncode(toJson())})';
   }
 }
 
diff --git a/lib/apis/sign_api/sessions.dart b/lib/apis/sign_api/sessions.dart
index 50811a9d..578f4bbe 100644
--- a/lib/apis/sign_api/sessions.dart
+++ b/lib/apis/sign_api/sessions.dart
@@ -1,3 +1,4 @@
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/generic_store.dart';
 
 import 'package:walletconnect_flutter_v2/apis/sign_api/i_sessions.dart';
@@ -16,6 +17,7 @@ class Sessions extends GenericStore<SessionData> implements ISessions {
     String topic, {
     int? expiry,
     Map<String, Namespace>? namespaces,
+    TransportType? transportType,
   }) async {
     checkInitialized();
 
@@ -30,6 +32,9 @@ class Sessions extends GenericStore<SessionData> implements ISessions {
     if (namespaces != null) {
       info = info.copyWith(namespaces: namespaces);
     }
+    if (transportType != null) {
+      info = info.copyWith(transportType: transportType);
+    }
 
     await set(topic, info);
   }
diff --git a/lib/apis/sign_api/sign_client.dart b/lib/apis/sign_api/sign_client.dart
index 4ddab595..5e8e281f 100644
--- a/lib/apis/sign_api/sign_client.dart
+++ b/lib/apis/sign_api/sign_client.dart
@@ -555,6 +555,7 @@ class SignClient implements ISignClient {
   @override
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
+    String? walletUniversalLink,
     String? pairingTopic,
     List<List<String>>? methods = const [
       [MethodConstants.WC_SESSION_AUTHENTICATE]
@@ -563,6 +564,7 @@ class SignClient implements ISignClient {
     try {
       return engine.authenticate(
         params: params,
+        walletUniversalLink: walletUniversalLink,
         pairingTopic: pairingTopic,
         methods: methods,
       );
@@ -669,6 +671,21 @@ class SignClient implements ISignClient {
     }
   }
 
+  @override
+  Future<void> dispatchEnvelope(String url) async {
+    return engine.dispatchEnvelope(url);
+  }
+
+  @override
+  Future<bool> redirectToDapp(PairingMetadata? metadata) {
+    return engine.redirectToDapp(metadata);
+  }
+
+  @override
+  Future<bool> redirectToWallet(PairingMetadata? metadata) {
+    return engine.redirectToWallet(metadata);
+  }
+
   @override
   IGenericStore<String> get pairingTopics => engine.pairingTopics;
 }
diff --git a/lib/apis/utils/constants.dart b/lib/apis/utils/constants.dart
index f757db30..5fe844fa 100644
--- a/lib/apis/utils/constants.dart
+++ b/lib/apis/utils/constants.dart
@@ -45,6 +45,8 @@ class StoreVersions {
   static const CONTEXT_TOPIC_TO_RECEIVER_PUBLIC_KEY =
       'topicToReceiverPublicKey';
   static const VERSION_TOPIC_TO_RECEIVER_PUBLIC_KEY = '1.1';
+  static const CONTEXT_LINKMODE = 'linkmode';
+  static const VERSION_LINKMODE = '1.0';
 
   // Sign
   static const CONTEXT_PROPOSALS = 'proposals';
diff --git a/lib/apis/web3app/web3app.dart b/lib/apis/web3app/web3app.dart
index a9bdd506..3cbde673 100644
--- a/lib/apis/web3app/web3app.dart
+++ b/lib/apis/web3app/web3app.dart
@@ -342,6 +342,20 @@ class Web3App implements IWeb3App {
     }
   }
 
+  @override
+  Future<void> dispatchEnvelope(String url) async {
+    try {
+      return await signEngine.dispatchEnvelope(url);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<bool> redirectToWallet(PairingMetadata? metadata) {
+    return signEngine.redirectToWallet(metadata);
+  }
+
   @override
   IPairingStore get pairings => core.pairing.getStore();
 
@@ -405,6 +419,7 @@ class Web3App implements IWeb3App {
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
     String? pairingTopic,
+    String? walletUniversalLink,
     List<List<String>>? methods = const [
       [MethodConstants.WC_SESSION_AUTHENTICATE]
     ],
@@ -412,6 +427,7 @@ class Web3App implements IWeb3App {
     try {
       return signEngine.authenticate(
         params: params,
+        walletUniversalLink: walletUniversalLink,
         pairingTopic: pairingTopic,
         methods: methods,
       );
diff --git a/lib/apis/web3wallet/web3wallet.dart b/lib/apis/web3wallet/web3wallet.dart
index 75c95cce..aa03bf01 100644
--- a/lib/apis/web3wallet/web3wallet.dart
+++ b/lib/apis/web3wallet/web3wallet.dart
@@ -394,6 +394,20 @@ class Web3Wallet implements IWeb3Wallet {
     }
   }
 
+  @override
+  Future<void> dispatchEnvelope(String url) async {
+    try {
+      return await signEngine.dispatchEnvelope(url);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<bool> redirectToDapp(PairingMetadata? metadata) {
+    return signEngine.redirectToDapp(metadata);
+  }
+
   @override
   IPairingStore get pairings => core.pairing.getStore();
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 71ac1658..986a3809 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,6 +24,7 @@ dependencies:
   shared_preferences: ^2.2.2
   stack_trace: ^1.10.0
   stream_channel: ^2.1.0
+  url_launcher: ^6.3.0
   web3dart: ^2.7.3
   web_socket_channel: ^2.4.4
   x25519: ^0.1.1
diff --git a/test/core_api/pairing_test.dart b/test/core_api/pairing_test.dart
index 1f0d5dad..8ffb74d3 100644
--- a/test/core_api/pairing_test.dart
+++ b/test/core_api/pairing_test.dart
@@ -378,7 +378,7 @@ void main() {
           );
           coreA.pairing.register(
             method: 'wc_sessionPropose',
-            function: (s, r) => {},
+            function: (s, r, [t = TransportType.relay]) => {},
             type: ProtocolType.sign,
           );
           expect(
@@ -395,7 +395,7 @@ void main() {
           );
           coreA.pairing.register(
             method: 'wc_authRequest',
-            function: (s, r) => {},
+            function: (s, r, [t = TransportType.relay]) => {},
             type: ProtocolType.auth,
           );
           expect(
@@ -417,17 +417,17 @@ void main() {
           List<RegisteredFunction> registeredFunctions = [
             RegisteredFunction(
               method: MethodConstants.WC_SESSION_PROPOSE,
-              function: (s, r) => {},
+              function: (s, r, [t = TransportType.relay]) => {},
               type: ProtocolType.sign,
             ),
             RegisteredFunction(
               method: 'wc_authRequest',
-              function: (s, r) => {},
+              function: (s, r, [t = TransportType.relay]) => {},
               type: ProtocolType.sign,
             ),
             RegisteredFunction(
               method: 'wc_authBatchRequest',
-              function: (s, r) => {},
+              function: (s, r, [t = TransportType.relay]) => {},
               type: ProtocolType.sign,
             )
           ];
diff --git a/test/shared/shared_test_utils.mocks.dart b/test/shared/shared_test_utils.mocks.dart
index 6ea9a3b6..140cf278 100644
--- a/test/shared/shared_test_utils.mocks.dart
+++ b/test/shared/shared_test_utils.mocks.dart
@@ -3,22 +3,22 @@
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i22;
-import 'dart:typed_data' as _i20;
+import 'dart:async' as _i23;
+import 'dart:typed_data' as _i21;
 
 import 'package:event/event.dart' as _i8;
 import 'package:http/http.dart' as _i9;
-import 'package:logger/logger.dart' as _i18;
+import 'package:logger/logger.dart' as _i19;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i21;
+import 'package:mockito/src/dummies.dart' as _i22;
 import 'package:walletconnect_flutter_v2/apis/core/connectivity/i_connectivity.dart'
     as _i17;
-import 'package:walletconnect_flutter_v2/apis/core/core.dart' as _i27;
-import 'package:walletconnect_flutter_v2/apis/core/crypto/crypto.dart' as _i23;
+import 'package:walletconnect_flutter_v2/apis/core/core.dart' as _i28;
+import 'package:walletconnect_flutter_v2/apis/core/crypto/crypto.dart' as _i24;
 import 'package:walletconnect_flutter_v2/apis/core/crypto/crypto_models.dart'
     as _i2;
 import 'package:walletconnect_flutter_v2/apis/core/crypto/crypto_utils.dart'
-    as _i19;
+    as _i20;
 import 'package:walletconnect_flutter_v2/apis/core/crypto/i_crypto.dart'
     as _i10;
 import 'package:walletconnect_flutter_v2/apis/core/crypto/i_crypto_utils.dart'
@@ -36,16 +36,18 @@ import 'package:walletconnect_flutter_v2/apis/core/relay_auth/i_relay_auth.dart'
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/i_relay_client.dart'
     as _i11;
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/message_tracker.dart'
-    as _i24;
+    as _i25;
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/websocket/http_client.dart'
-    as _i26;
+    as _i27;
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/websocket/websocket_handler.dart'
-    as _i28;
+    as _i29;
 import 'package:walletconnect_flutter_v2/apis/core/store/i_generic_store.dart'
     as _i4;
 import 'package:walletconnect_flutter_v2/apis/core/store/i_store.dart' as _i7;
 import 'package:walletconnect_flutter_v2/apis/core/store/store_models.dart'
-    as _i25;
+    as _i26;
+import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart'
+    as _i18;
 import 'package:walletconnect_flutter_v2/apis/core/verify/i_verify.dart'
     as _i16;
 
@@ -247,8 +249,19 @@ class _FakeIConnectivity_17 extends _i1.SmartFake
         );
 }
 
-class _FakeLogger_18 extends _i1.SmartFake implements _i18.Logger {
-  _FakeLogger_18(
+class _FakeISupportedLinkModeStore_18 extends _i1.SmartFake
+    implements _i18.ISupportedLinkModeStore {
+  _FakeISupportedLinkModeStore_18(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeLogger_19 extends _i1.SmartFake implements _i19.Logger {
+  _FakeLogger_19(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -260,7 +273,7 @@ class _FakeLogger_18 extends _i1.SmartFake implements _i18.Logger {
 /// A class which mocks [CryptoUtils].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
+class MockCryptoUtils extends _i1.Mock implements _i20.CryptoUtils {
   MockCryptoUtils() {
     _i1.throwOnMissingStub(this);
   }
@@ -281,13 +294,13 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
       ) as _i2.CryptoKeyPair);
 
   @override
-  _i20.Uint8List randomBytes(int? length) => (super.noSuchMethod(
+  _i21.Uint8List randomBytes(int? length) => (super.noSuchMethod(
         Invocation.method(
           #randomBytes,
           [length],
         ),
-        returnValue: _i20.Uint8List(0),
-      ) as _i20.Uint8List);
+        returnValue: _i21.Uint8List(0),
+      ) as _i21.Uint8List);
 
   @override
   String generateRandomBytes32() => (super.noSuchMethod(
@@ -295,7 +308,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
           #generateRandomBytes32,
           [],
         ),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.method(
             #generateRandomBytes32,
@@ -305,7 +318,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
       ) as String);
 
   @override
-  _i22.Future<String> deriveSymKey(
+  _i23.Future<String> deriveSymKey(
     String? privKeyA,
     String? pubKeyB,
   ) =>
@@ -317,7 +330,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             pubKeyB,
           ],
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #deriveSymKey,
@@ -327,7 +340,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             ],
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
   String hashKey(String? key) => (super.noSuchMethod(
@@ -335,7 +348,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
           #hashKey,
           [key],
         ),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.method(
             #hashKey,
@@ -350,7 +363,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
           #hashMessage,
           [message],
         ),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.method(
             #hashMessage,
@@ -360,7 +373,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
       ) as String);
 
   @override
-  _i22.Future<String> encrypt(
+  _i23.Future<String> encrypt(
     String? message,
     String? symKey, {
     int? type,
@@ -380,7 +393,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             #senderPublicKey: senderPublicKey,
           },
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #encrypt,
@@ -395,10 +408,10 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             },
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
-  _i22.Future<String> decrypt(
+  _i23.Future<String> decrypt(
     String? symKey,
     String? encoded,
   ) =>
@@ -410,7 +423,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             encoded,
           ],
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #decrypt,
@@ -420,14 +433,14 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
             ],
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
   String serialize(
     int? type,
-    _i20.Uint8List? sealed,
-    _i20.Uint8List? iv, {
-    _i20.Uint8List? senderPublicKey,
+    _i21.Uint8List? sealed,
+    _i21.Uint8List? iv, {
+    _i21.Uint8List? senderPublicKey,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -439,7 +452,7 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
           ],
           {#senderPublicKey: senderPublicKey},
         ),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.method(
             #serialize,
@@ -527,12 +540,75 @@ class MockCryptoUtils extends _i1.Mock implements _i19.CryptoUtils {
         ),
         returnValue: false,
       ) as bool);
+
+  @override
+  bool isTypeTwoEnvelope(_i2.EncodingValidation? result) => (super.noSuchMethod(
+        Invocation.method(
+          #isTypeTwoEnvelope,
+          [result],
+        ),
+        returnValue: false,
+      ) as bool);
+
+  @override
+  _i21.Uint8List encodeTypeByte(int? type) => (super.noSuchMethod(
+        Invocation.method(
+          #encodeTypeByte,
+          [type],
+        ),
+        returnValue: _i21.Uint8List(0),
+      ) as _i21.Uint8List);
+
+  @override
+  int decodeTypeByte(_i21.Uint8List? byte) => (super.noSuchMethod(
+        Invocation.method(
+          #decodeTypeByte,
+          [byte],
+        ),
+        returnValue: 0,
+      ) as int);
+
+  @override
+  String encodeTypeTwoEnvelope({required String? message}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #encodeTypeTwoEnvelope,
+          [],
+          {#message: message},
+        ),
+        returnValue: _i22.dummyValue<String>(
+          this,
+          Invocation.method(
+            #encodeTypeTwoEnvelope,
+            [],
+            {#message: message},
+          ),
+        ),
+      ) as String);
+
+  @override
+  String decodeTypeTwoEnvelope({required String? message}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #decodeTypeTwoEnvelope,
+          [],
+          {#message: message},
+        ),
+        returnValue: _i22.dummyValue<String>(
+          this,
+          Invocation.method(
+            #decodeTypeTwoEnvelope,
+            [],
+            {#message: message},
+          ),
+        ),
+      ) as String);
 }
 
 /// A class which mocks [Crypto].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCrypto extends _i1.Mock implements _i23.Crypto {
+class MockCrypto extends _i1.Mock implements _i24.Crypto {
   MockCrypto() {
     _i1.throwOnMissingStub(this);
   }
@@ -603,21 +679,21 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
   @override
   String get name => (super.noSuchMethod(
         Invocation.getter(#name),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#name),
         ),
       ) as String);
 
   @override
-  _i22.Future<void> init() => (super.noSuchMethod(
+  _i23.Future<void> init() => (super.noSuchMethod(
         Invocation.method(
           #init,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
   bool hasKeys(String? tag) => (super.noSuchMethod(
@@ -629,37 +705,37 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
       ) as bool);
 
   @override
-  _i22.Future<String> getClientId() => (super.noSuchMethod(
+  _i23.Future<String> getClientId() => (super.noSuchMethod(
         Invocation.method(
           #getClientId,
           [],
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #getClientId,
             [],
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
-  _i22.Future<String> generateKeyPair() => (super.noSuchMethod(
+  _i23.Future<String> generateKeyPair() => (super.noSuchMethod(
         Invocation.method(
           #generateKeyPair,
           [],
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #generateKeyPair,
             [],
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
-  _i22.Future<String> generateSharedKey(
+  _i23.Future<String> generateSharedKey(
     String? selfPublicKey,
     String? peerPublicKey, {
     String? overrideTopic,
@@ -673,7 +749,7 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
           ],
           {#overrideTopic: overrideTopic},
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #generateSharedKey,
@@ -684,10 +760,10 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
             {#overrideTopic: overrideTopic},
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
-  _i22.Future<String> setSymKey(
+  _i23.Future<String> setSymKey(
     String? symKey, {
     String? overrideTopic,
   }) =>
@@ -697,7 +773,7 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
           [symKey],
           {#overrideTopic: overrideTopic},
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #setSymKey,
@@ -705,30 +781,30 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
             {#overrideTopic: overrideTopic},
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
-  _i22.Future<void> deleteKeyPair(String? publicKey) => (super.noSuchMethod(
+  _i23.Future<void> deleteKeyPair(String? publicKey) => (super.noSuchMethod(
         Invocation.method(
           #deleteKeyPair,
           [publicKey],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> deleteSymKey(String? topic) => (super.noSuchMethod(
+  _i23.Future<void> deleteSymKey(String? topic) => (super.noSuchMethod(
         Invocation.method(
           #deleteSymKey,
           [topic],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<String?> encode(
+  _i23.Future<String?> encode(
     String? topic,
     Map<String, dynamic>? payload, {
     _i2.EncodeOptions? options,
@@ -742,11 +818,11 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
           ],
           {#options: options},
         ),
-        returnValue: _i22.Future<String?>.value(),
-      ) as _i22.Future<String?>);
+        returnValue: _i23.Future<String?>.value(),
+      ) as _i23.Future<String?>);
 
   @override
-  _i22.Future<String?> decode(
+  _i23.Future<String?> decode(
     String? topic,
     String? encoded, {
     _i2.DecodeOptions? options,
@@ -760,23 +836,23 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
           ],
           {#options: options},
         ),
-        returnValue: _i22.Future<String?>.value(),
-      ) as _i22.Future<String?>);
+        returnValue: _i23.Future<String?>.value(),
+      ) as _i23.Future<String?>);
 
   @override
-  _i22.Future<String> signJWT(String? aud) => (super.noSuchMethod(
+  _i23.Future<String> signJWT(String? aud) => (super.noSuchMethod(
         Invocation.method(
           #signJWT,
           [aud],
         ),
-        returnValue: _i22.Future<String>.value(_i21.dummyValue<String>(
+        returnValue: _i23.Future<String>.value(_i22.dummyValue<String>(
           this,
           Invocation.method(
             #signJWT,
             [aud],
           ),
         )),
-      ) as _i22.Future<String>);
+      ) as _i23.Future<String>);
 
   @override
   int getPayloadType(String? encoded) => (super.noSuchMethod(
@@ -787,6 +863,13 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
         returnValue: 0,
       ) as int);
 
+  @override
+  String? getPayloadSenderPublicKey(String? encoded) =>
+      (super.noSuchMethod(Invocation.method(
+        #getPayloadSenderPublicKey,
+        [encoded],
+      )) as String?);
+
   @override
   _i5.ICryptoUtils getUtils() => (super.noSuchMethod(
         Invocation.method(
@@ -806,7 +889,7 @@ class MockCrypto extends _i1.Mock implements _i23.Crypto {
 /// A class which mocks [MessageTracker].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
+class MockMessageTracker extends _i1.Mock implements _i25.MessageTracker {
   MockMessageTracker() {
     _i1.throwOnMissingStub(this);
   }
@@ -814,7 +897,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
   @override
   String get context => (super.noSuchMethod(
         Invocation.getter(#context),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#context),
         ),
@@ -823,7 +906,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
   @override
   String get version => (super.noSuchMethod(
         Invocation.getter(#version),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#version),
         ),
@@ -839,43 +922,43 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
       ) as _i7.IStore<dynamic>);
 
   @override
-  _i8.Event<_i25.StoreCreateEvent<Map<String, String>>> get onCreate =>
+  _i8.Event<_i26.StoreCreateEvent<Map<String, String>>> get onCreate =>
       (super.noSuchMethod(
         Invocation.getter(#onCreate),
-        returnValue: _FakeEvent_8<_i25.StoreCreateEvent<Map<String, String>>>(
+        returnValue: _FakeEvent_8<_i26.StoreCreateEvent<Map<String, String>>>(
           this,
           Invocation.getter(#onCreate),
         ),
-      ) as _i8.Event<_i25.StoreCreateEvent<Map<String, String>>>);
+      ) as _i8.Event<_i26.StoreCreateEvent<Map<String, String>>>);
 
   @override
-  _i8.Event<_i25.StoreUpdateEvent<Map<String, String>>> get onUpdate =>
+  _i8.Event<_i26.StoreUpdateEvent<Map<String, String>>> get onUpdate =>
       (super.noSuchMethod(
         Invocation.getter(#onUpdate),
-        returnValue: _FakeEvent_8<_i25.StoreUpdateEvent<Map<String, String>>>(
+        returnValue: _FakeEvent_8<_i26.StoreUpdateEvent<Map<String, String>>>(
           this,
           Invocation.getter(#onUpdate),
         ),
-      ) as _i8.Event<_i25.StoreUpdateEvent<Map<String, String>>>);
+      ) as _i8.Event<_i26.StoreUpdateEvent<Map<String, String>>>);
 
   @override
-  _i8.Event<_i25.StoreDeleteEvent<Map<String, String>>> get onDelete =>
+  _i8.Event<_i26.StoreDeleteEvent<Map<String, String>>> get onDelete =>
       (super.noSuchMethod(
         Invocation.getter(#onDelete),
-        returnValue: _FakeEvent_8<_i25.StoreDeleteEvent<Map<String, String>>>(
+        returnValue: _FakeEvent_8<_i26.StoreDeleteEvent<Map<String, String>>>(
           this,
           Invocation.getter(#onDelete),
         ),
-      ) as _i8.Event<_i25.StoreDeleteEvent<Map<String, String>>>);
+      ) as _i8.Event<_i26.StoreDeleteEvent<Map<String, String>>>);
 
   @override
-  _i8.Event<_i25.StoreSyncEvent> get onSync => (super.noSuchMethod(
+  _i8.Event<_i26.StoreSyncEvent> get onSync => (super.noSuchMethod(
         Invocation.getter(#onSync),
-        returnValue: _FakeEvent_8<_i25.StoreSyncEvent>(
+        returnValue: _FakeEvent_8<_i26.StoreSyncEvent>(
           this,
           Invocation.getter(#onSync),
         ),
-      ) as _i8.Event<_i25.StoreSyncEvent>);
+      ) as _i8.Event<_i26.StoreSyncEvent>);
 
   @override
   Map<String, Map<String, String>> get data => (super.noSuchMethod(
@@ -901,7 +984,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
   @override
   String get storageKey => (super.noSuchMethod(
         Invocation.getter(#storageKey),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#storageKey),
         ),
@@ -913,7 +996,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
           #hashMessage,
           [message],
         ),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.method(
             #hashMessage,
@@ -923,7 +1006,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
       ) as String);
 
   @override
-  _i22.Future<void> recordMessageEvent(
+  _i23.Future<void> recordMessageEvent(
     String? topic,
     String? message,
   ) =>
@@ -935,9 +1018,9 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
             message,
           ],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
   bool messageIsRecorded(
@@ -956,14 +1039,14 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
       ) as bool);
 
   @override
-  _i22.Future<void> init() => (super.noSuchMethod(
+  _i23.Future<void> init() => (super.noSuchMethod(
         Invocation.method(
           #init,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
   bool has(String? key) => (super.noSuchMethod(
@@ -991,7 +1074,7 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
       ) as List<Map<String, String>>);
 
   @override
-  _i22.Future<void> set(
+  _i23.Future<void> set(
     String? key,
     Map<String, String>? value,
   ) =>
@@ -1003,39 +1086,39 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
             value,
           ],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> delete(String? key) => (super.noSuchMethod(
+  _i23.Future<void> delete(String? key) => (super.noSuchMethod(
         Invocation.method(
           #delete,
           [key],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> persist() => (super.noSuchMethod(
+  _i23.Future<void> persist() => (super.noSuchMethod(
         Invocation.method(
           #persist,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> restore() => (super.noSuchMethod(
+  _i23.Future<void> restore() => (super.noSuchMethod(
         Invocation.method(
           #restore,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
   void checkInitialized() => super.noSuchMethod(
@@ -1050,13 +1133,13 @@ class MockMessageTracker extends _i1.Mock implements _i24.MessageTracker {
 /// A class which mocks [HttpWrapper].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
+class MockHttpWrapper extends _i1.Mock implements _i27.HttpWrapper {
   MockHttpWrapper() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i22.Future<_i9.Response> get(
+  _i23.Future<_i9.Response> get(
     Uri? url, {
     Map<String, String>? headers,
   }) =>
@@ -1066,7 +1149,7 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
           [url],
           {#headers: headers},
         ),
-        returnValue: _i22.Future<_i9.Response>.value(_FakeResponse_9(
+        returnValue: _i23.Future<_i9.Response>.value(_FakeResponse_9(
           this,
           Invocation.method(
             #get,
@@ -1074,10 +1157,10 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
             {#headers: headers},
           ),
         )),
-      ) as _i22.Future<_i9.Response>);
+      ) as _i23.Future<_i9.Response>);
 
   @override
-  _i22.Future<_i9.Response> delete(
+  _i23.Future<_i9.Response> delete(
     Uri? url, {
     Map<String, String>? headers,
   }) =>
@@ -1087,7 +1170,7 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
           [url],
           {#headers: headers},
         ),
-        returnValue: _i22.Future<_i9.Response>.value(_FakeResponse_9(
+        returnValue: _i23.Future<_i9.Response>.value(_FakeResponse_9(
           this,
           Invocation.method(
             #delete,
@@ -1095,10 +1178,10 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
             {#headers: headers},
           ),
         )),
-      ) as _i22.Future<_i9.Response>);
+      ) as _i23.Future<_i9.Response>);
 
   @override
-  _i22.Future<_i9.Response> post(
+  _i23.Future<_i9.Response> post(
     Uri? url, {
     Map<String, String>? headers,
     Object? body,
@@ -1112,7 +1195,7 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
             #body: body,
           },
         ),
-        returnValue: _i22.Future<_i9.Response>.value(_FakeResponse_9(
+        returnValue: _i23.Future<_i9.Response>.value(_FakeResponse_9(
           this,
           Invocation.method(
             #post,
@@ -1123,13 +1206,13 @@ class MockHttpWrapper extends _i1.Mock implements _i26.HttpWrapper {
             },
           ),
         )),
-      ) as _i22.Future<_i9.Response>);
+      ) as _i23.Future<_i9.Response>);
 }
 
 /// A class which mocks [Core].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCore extends _i1.Mock implements _i27.Core {
+class MockCore extends _i1.Mock implements _i28.Core {
   MockCore() {
     _i1.throwOnMissingStub(this);
   }
@@ -1137,7 +1220,7 @@ class MockCore extends _i1.Mock implements _i27.Core {
   @override
   String get projectId => (super.noSuchMethod(
         Invocation.getter(#projectId),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#projectId),
         ),
@@ -1146,7 +1229,7 @@ class MockCore extends _i1.Mock implements _i27.Core {
   @override
   String get relayUrl => (super.noSuchMethod(
         Invocation.getter(#relayUrl),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#relayUrl),
         ),
@@ -1164,7 +1247,7 @@ class MockCore extends _i1.Mock implements _i27.Core {
   @override
   String get pushUrl => (super.noSuchMethod(
         Invocation.getter(#pushUrl),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#pushUrl),
         ),
@@ -1323,6 +1406,25 @@ class MockCore extends _i1.Mock implements _i27.Core {
         returnValueForMissingStub: null,
       );
 
+  @override
+  _i18.ISupportedLinkModeStore get linkModeApps => (super.noSuchMethod(
+        Invocation.getter(#linkModeApps),
+        returnValue: _FakeISupportedLinkModeStore_18(
+          this,
+          Invocation.getter(#linkModeApps),
+        ),
+      ) as _i18.ISupportedLinkModeStore);
+
+  @override
+  set linkModeApps(_i18.ISupportedLinkModeStore? _linkModeApps) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #linkModeApps,
+          _linkModeApps,
+        ),
+        returnValueForMissingStub: null,
+      );
+
   @override
   _i7.IStore<Map<String, dynamic>> get storage => (super.noSuchMethod(
         Invocation.getter(#storage),
@@ -1344,7 +1446,7 @@ class MockCore extends _i1.Mock implements _i27.Core {
   @override
   String get protocol => (super.noSuchMethod(
         Invocation.getter(#protocol),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#protocol),
         ),
@@ -1353,23 +1455,23 @@ class MockCore extends _i1.Mock implements _i27.Core {
   @override
   String get version => (super.noSuchMethod(
         Invocation.getter(#version),
-        returnValue: _i21.dummyValue<String>(
+        returnValue: _i22.dummyValue<String>(
           this,
           Invocation.getter(#version),
         ),
       ) as String);
 
   @override
-  _i18.Logger get logger => (super.noSuchMethod(
+  _i19.Logger get logger => (super.noSuchMethod(
         Invocation.getter(#logger),
-        returnValue: _FakeLogger_18(
+        returnValue: _FakeLogger_19(
           this,
           Invocation.getter(#logger),
         ),
-      ) as _i18.Logger);
+      ) as _i19.Logger);
 
   @override
-  void addLogListener(_i18.LogCallback? callback) => super.noSuchMethod(
+  void addLogListener(_i19.LogCallback? callback) => super.noSuchMethod(
         Invocation.method(
           #addLogListener,
           [callback],
@@ -1378,7 +1480,7 @@ class MockCore extends _i1.Mock implements _i27.Core {
       );
 
   @override
-  bool removeLogListener(_i18.LogCallback? callback) => (super.noSuchMethod(
+  bool removeLogListener(_i19.LogCallback? callback) => (super.noSuchMethod(
         Invocation.method(
           #removeLogListener,
           [callback],
@@ -1387,58 +1489,87 @@ class MockCore extends _i1.Mock implements _i27.Core {
       ) as bool);
 
   @override
-  _i22.Future<void> start() => (super.noSuchMethod(
+  _i23.Future<void> start() => (super.noSuchMethod(
         Invocation.method(
           #start,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+
+  @override
+  _i23.Future<void> addLinkModeSupportedApp(String? universalLink) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addLinkModeSupportedApp,
+          [universalLink],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+
+  @override
+  List<String> getLinkModeSupportedApps() => (super.noSuchMethod(
+        Invocation.method(
+          #getLinkModeSupportedApps,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+
+  @override
+  void confirmOnlineStateOrThrow() => super.noSuchMethod(
+        Invocation.method(
+          #confirmOnlineStateOrThrow,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebSocketHandler].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWebSocketHandler extends _i1.Mock implements _i28.WebSocketHandler {
+class MockWebSocketHandler extends _i1.Mock implements _i29.WebSocketHandler {
   MockWebSocketHandler() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i22.Future<void> get ready => (super.noSuchMethod(
+  _i23.Future<void> get ready => (super.noSuchMethod(
         Invocation.getter(#ready),
-        returnValue: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> setup({required String? url}) => (super.noSuchMethod(
+  _i23.Future<void> setup({required String? url}) => (super.noSuchMethod(
         Invocation.method(
           #setup,
           [],
           {#url: url},
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> connect() => (super.noSuchMethod(
+  _i23.Future<void> connect() => (super.noSuchMethod(
         Invocation.method(
           #connect,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 
   @override
-  _i22.Future<void> close() => (super.noSuchMethod(
+  _i23.Future<void> close() => (super.noSuchMethod(
         Invocation.method(
           #close,
           [],
         ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
 }
diff --git a/test/sign_api/utils/sign_client_test_wrapper.dart b/test/sign_api/utils/sign_client_test_wrapper.dart
index a83d5812..e726c8e7 100644
--- a/test/sign_api/utils/sign_client_test_wrapper.dart
+++ b/test/sign_api/utils/sign_client_test_wrapper.dart
@@ -420,6 +420,25 @@ class SignClientTestWrapper implements ISignEngine {
     }
   }
 
+  @override
+  Future<void> dispatchEnvelope(String url) {
+    try {
+      return client.dispatchEnvelope(url);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<bool> redirectToDapp(PairingMetadata? metadata) {
+    return client.redirectToDapp(metadata);
+  }
+
+  @override
+  Future<bool> redirectToWallet(PairingMetadata? metadata) {
+    return client.redirectToWallet(metadata);
+  }
+
   @override
   IPairingStore get pairings => core.pairing.getStore();
 
@@ -533,6 +552,7 @@ class SignClientTestWrapper implements ISignEngine {
   @override
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
+    String? walletUniversalLink,
     String? pairingTopic,
     List<List<String>>? methods,
   }) async {

From 1148a61aeef8661d02c95f33a75491e1043106aa Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 23 Aug 2024 12:35:03 +0200
Subject: [PATCH 03/22] ios completed on both wallet and dapp sides

---
 .../dapp/ios/Runner.xcodeproj/project.pbxproj |  16 +-
 example/dapp/ios/Runner/AppDelegate.swift     |  83 +++-
 example/dapp/lib/main.dart                    |  69 ++-
 example/dapp/lib/pages/connect_page.dart      | 254 ++++++-----
 example/dapp/lib/widgets/pairing_item.dart    |   1 +
 example/dapp/lib/widgets/session_widget.dart  |   9 +-
 .../ios/Runner.xcodeproj/project.pbxproj      |   8 +
 .../lib/dependencies/deep_link_handler.dart   |  13 +-
 .../dependencies/key_service/key_service.dart |   3 +-
 .../lib/dependencies/web3wallet_service.dart  |  21 +-
 lib/apis/core/core.dart                       |  29 ++
 lib/apis/core/crypto/crypto.dart              |  20 +
 lib/apis/core/crypto/crypto_utils.dart        |  78 +++-
 lib/apis/core/crypto/i_crypto.dart            |   2 +
 lib/apis/core/crypto/i_crypto_utils.dart      |  11 +
 lib/apis/core/i_core.dart                     |  14 +-
 lib/apis/core/pairing/i_pairing.dart          |  20 +-
 lib/apis/core/pairing/pairing.dart            | 271 +++++++----
 .../core/relay_client/i_relay_client.dart     |  12 +-
 lib/apis/core/relay_client/relay_client.dart  |  54 ++-
 lib/apis/sign_api/models/session_models.dart  |  22 +
 lib/apis/sign_api/sign_engine.dart            | 425 +++++++++++++++---
 .../sign_api/utils/auth/auth_constants.dart   |   2 -
 lib/apis/utils/constants.dart                 |  18 +-
 lib/apis/utils/extensions.dart                |   4 +
 lib/apis/utils/walletconnect_utils.dart       |  32 ++
 test/shared/shared_test_utils.mocks.dart      |  23 +-
 27 files changed, 1162 insertions(+), 352 deletions(-)

diff --git a/example/dapp/ios/Runner.xcodeproj/project.pbxproj b/example/dapp/ios/Runner.xcodeproj/project.pbxproj
index 7c94090d..6a1737b5 100644
--- a/example/dapp/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/dapp/ios/Runner.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@
 		0964B3102C494D2000AE1CDA /* Debug-internal.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Debug-internal.xcconfig"; path = "Flutter/Debug-internal.xcconfig"; sourceTree = "<group>"; };
 		0964B3112C494D2000AE1CDA /* Release-production.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Release-production.xcconfig"; path = "Flutter/Release-production.xcconfig"; sourceTree = "<group>"; };
 		0964B3122C49545400AE1CDA /* Info-internal.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-internal.plist"; sourceTree = "<group>"; };
+		09969A8C2C73BC9100B14363 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		2269C513CF66C603D39509BB /* Pods-Runner.debug-internal.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-internal.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-internal.xcconfig"; sourceTree = "<group>"; };
@@ -128,6 +129,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				09969A8C2C73BC9100B14363 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -380,6 +382,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -462,6 +465,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
@@ -542,6 +546,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -625,6 +630,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
@@ -642,7 +648,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.flutterdapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.flutterdapp 1721392810";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.flutterdapp 1724090152";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -761,8 +767,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
@@ -778,7 +785,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.flutterdapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.flutterdapp 1721392810";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.walletconnect.flutterdapp";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -792,6 +799,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
@@ -809,7 +817,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.flutterdapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.flutterdapp 1721392810";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.flutterdapp 1724090152";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/example/dapp/ios/Runner/AppDelegate.swift b/example/dapp/ios/Runner/AppDelegate.swift
index 70693e4a..641708da 100644
--- a/example/dapp/ios/Runner/AppDelegate.swift
+++ b/example/dapp/ios/Runner/AppDelegate.swift
@@ -3,11 +3,80 @@ import Flutter
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
+    
+    private static let EVENTS_CHANNEL = "com.walletconnect.flutterwallet/events"
+    private static let METHODS_CHANNEL = "com.walletconnect.flutterwallet/methods"
+    
+    private var eventsChannel: FlutterEventChannel?
+    private var methodsChannel: FlutterMethodChannel?
+    var initialLink: String?
+    
+    private let linkStreamHandler = LinkStreamHandler()
+    
+    override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        GeneratedPluginRegistrant.register(with: self)
+        
+        let controller = window.rootViewController as! FlutterViewController
+        eventsChannel = FlutterEventChannel(name: AppDelegate.EVENTS_CHANNEL, binaryMessenger: controller.binaryMessenger)
+        eventsChannel?.setStreamHandler(linkStreamHandler)
+        
+        methodsChannel = FlutterMethodChannel(name: AppDelegate.METHODS_CHANNEL, binaryMessenger: controller.binaryMessenger)
+        methodsChannel?.setMethodCallHandler({ [weak self] (call: FlutterMethodCall, result: FlutterResult) -> Void in
+            if (call.method == "initialLink") {
+                if let link = self?.initialLink {
+                    self?.initialLink = nil
+                    result(link)
+                } else {
+                    result("")
+                }
+            }
+        })
+        
+        // Add your deep link handling logic here
+        if let url = launchOptions?[.url] as? URL {
+            self.initialLink = url.absoluteString
+        }
+        
+        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    }
+    
+    override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+        return linkStreamHandler.handleLink(url.absoluteString)
+    }
+    
+    override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        // Handle universal links
+        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            if let url = userActivity.webpageURL {
+                return linkStreamHandler.handleLink(url.absoluteString)
+            }
+        }
+        return false
+    }
+}
+
+class LinkStreamHandler: NSObject, FlutterStreamHandler {
+    var eventSink: FlutterEventSink?
+    var queuedLinks = [String]()
+    
+    func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
+        self.eventSink = events
+        queuedLinks.forEach({ events($0) })
+        queuedLinks.removeAll()
+        return nil
+    }
+    
+    func onCancel(withArguments arguments: Any?) -> FlutterError? {
+        self.eventSink = nil
+        return nil
+    }
+    
+    func handleLink(_ link: String) -> Bool {
+        guard let eventSink = eventSink else {
+            queuedLinks.append(link)
+            return false
+        }
+        eventSink(link)
+        return true
+    }
 }
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index cf5565c8..c0c41fc1 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -13,12 +13,15 @@ import 'package:walletconnect_flutter_v2_dapp/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/chain_data.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/helpers.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/dart_defines.dart';
+import 'package:walletconnect_flutter_v2_dapp/utils/deep_link_handler.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/string_constants.dart';
 import 'package:walletconnect_flutter_v2_dapp/widgets/event_widget.dart';
 
 import 'package:walletconnect_flutter_v2_dapp/imports.dart';
 
 void main() {
+  WidgetsFlutterBinding.ensureInitialized();
+  DeepLinkHandler.initListener();
   runApp(const MyApp());
 }
 
@@ -59,12 +62,38 @@ class _MyHomePageState extends State<MyHomePage> {
     initialize();
   }
 
-  Future<void> initialize() async {
+  String get _flavor {
     String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-    flavor = flavor.replaceAll('-production', '');
+    return flavor.replaceAll('-production', '');
+  }
+
+  // ignore: unused_element
+  String _universalLink() {
+    Uri link = Uri.parse('https://lab.web3modal.com/flutter_appkit');
+    if (_flavor.isNotEmpty) {
+      return link
+          .replace(path: '${link.path}_internal')
+          .replace(host: 'dev.${link.host}')
+          .toString();
+    }
+    return link.toString();
+  }
+
+  Redirect _constructRedirect() {
+    return Redirect(
+      native: 'wcflutterdapp$_flavor://',
+      universal: _universalLink(),
+      // enable linkMode on Wallet so Dapps can use relay-less connection
+      // universal: value must be set on cloud config as well
+      linkMode: true,
+    );
+  }
+
+  Future<void> initialize() async {
     _web3App = Web3App(
       core: Core(
         projectId: DartDefines.projectId,
+        logLevel: LogLevel.error,
       ),
       metadata: PairingMetadata(
         name: 'Sample dApp Flutter',
@@ -73,10 +102,7 @@ class _MyHomePageState extends State<MyHomePage> {
         icons: [
           'https://images.prismic.io/wallet-connect/65785a56531ac2845a260732_WalletConnect-App-Logo-1024X1024.png'
         ],
-        redirect: Redirect(
-          native: 'wcflutterdapp$flavor://',
-          // universal: 'https://walletconnect.com',
-        ),
+        redirect: _constructRedirect(),
       ),
     );
 
@@ -100,6 +126,9 @@ class _MyHomePageState extends State<MyHomePage> {
 
     await _web3App!.init();
 
+    DeepLinkHandler.init(_web3App!);
+    DeepLinkHandler.checkInitialLink();
+
     // Loop through all the chain data
     for (final ChainMetadata chain in ChainData.allChains) {
       // Loop through the events for that chain
@@ -140,11 +169,19 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   void _onSessionConnect(SessionConnect? event) {
-    log('[SampleDapp] _onSessionConnect $event');
+    debugPrint('[SampleDapp] _onSessionConnect $event');
+    Future.delayed(const Duration(milliseconds: 500), () {
+      setState(() => _selectedIndex = 2);
+    });
   }
 
   void _onSessionAuthResponse(SessionAuthResponse? response) {
-    log('[SampleDapp] _onSessionAuthResponse $response');
+    debugPrint('[SampleDapp] _onSessionAuthResponse $response');
+    if (response?.session != null) {
+      Future.delayed(const Duration(milliseconds: 500), () {
+        setState(() => _selectedIndex = 2);
+      });
+    }
   }
 
   void _setState(dynamic args) => setState(() {});
@@ -180,9 +217,9 @@ class _MyHomePageState extends State<MyHomePage> {
   void _logListener(LogEvent event) {
     if (event.level == Level.debug) {
       // TODO send to mixpanel
-      log('[Mixpanel] ${event.message}');
+      log('${event.message}');
     } else {
-      debugPrint('[Logger] ${event.level.name}: ${event.message}');
+      debugPrint('${event.message}');
     }
   }
 
@@ -246,11 +283,7 @@ class _MyHomePageState extends State<MyHomePage> {
       showUnselectedLabels: true,
       type: BottomNavigationBarType.fixed,
       // called when one tab is selected
-      onTap: (int index) {
-        setState(() {
-          _selectedIndex = index;
-        });
-      },
+      onTap: (index) => setState(() => _selectedIndex = index),
       // bottom tab items
       items: _pageDatas
           .map(
@@ -266,11 +299,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget _buildNavigationRail() {
     return NavigationRail(
       selectedIndex: _selectedIndex,
-      onDestinationSelected: (int index) {
-        setState(() {
-          _selectedIndex = index;
-        });
-      },
+      onDestinationSelected: (index) => setState(() => _selectedIndex = index),
       labelType: NavigationRailLabelType.selected,
       destinations: _pageDatas
           .map(
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index 64accaf1..c98e39cd 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -7,8 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-
 import 'package:walletconnect_flutter_v2_dapp/models/chain_metadata.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/chain_data.dart';
@@ -181,27 +179,12 @@ class ConnectPageState extends State<ConnectPage> {
     return ListView(
       padding: const EdgeInsets.symmetric(horizontal: StyleConstants.linear8),
       children: <Widget>[
-        Column(
-          children: [
-            const Text(
-              'Flutter Dapp',
-              style: StyleConstants.subtitleText,
-              textAlign: TextAlign.center,
-            ),
-            FutureBuilder<PackageInfo>(
-              future: PackageInfo.fromPlatform(),
-              builder: (context, snapshot) {
-                if (!snapshot.hasData) {
-                  return const SizedBox.shrink();
-                }
-                final v = snapshot.data!.version;
-                final b = snapshot.data!.buildNumber;
-                const f = String.fromEnvironment('FLUTTER_APP_FLAVOR');
-                return Text('$v-$f ($b) - SDK v$packageVersion');
-              },
-            ),
-          ],
+        const Text(
+          'Flutter Dapp',
+          style: StyleConstants.subtitleText,
+          textAlign: TextAlign.center,
         ),
+        const SizedBox(height: StyleConstants.linear8),
         SizedBox(
           height: StyleConstants.linear48,
           child: Row(
@@ -294,7 +277,7 @@ class ConnectPageState extends State<ConnectPage> {
                 style: _buttonStyle,
                 onPressed: _selectedChains.isEmpty
                     ? null
-                    : () => _oneClickAuth(
+                    : () => _sessionAuthenticate(
                           closeModal: () {
                             if (Navigator.canPop(context)) {
                               Navigator.of(context).pop();
@@ -314,6 +297,74 @@ class ConnectPageState extends State<ConnectPage> {
           ],
         ),
         const SizedBox(height: StyleConstants.linear16),
+        const Divider(height: 1.0),
+        const SizedBox(height: StyleConstants.linear16),
+        const Text(
+          'Redirect:',
+          style: TextStyle(fontWeight: FontWeight.bold),
+        ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('Native: '),
+            Expanded(
+              child: Text(
+                '${widget.web3App.metadata.redirect?.native}',
+                style: const TextStyle(fontWeight: FontWeight.bold),
+              ),
+            ),
+          ],
+        ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('Universal: '),
+            Expanded(
+              child: Text(
+                '${widget.web3App.metadata.redirect?.universal}',
+                style: const TextStyle(fontWeight: FontWeight.bold),
+              ),
+            ),
+          ],
+        ),
+        Row(
+          children: [
+            const Text('Link Mode: '),
+            Text(
+              '${widget.web3App.metadata.redirect?.linkMode}',
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+          ],
+        ),
+        const SizedBox(height: StyleConstants.linear8),
+        FutureBuilder<PackageInfo>(
+          future: PackageInfo.fromPlatform(),
+          builder: (context, snapshot) {
+            if (!snapshot.hasData) {
+              return const SizedBox.shrink();
+            }
+            final v = snapshot.data!.version;
+            final b = snapshot.data!.buildNumber;
+            const f = String.fromEnvironment('FLUTTER_APP_FLAVOR');
+            // return Text('App Version: $v-$f ($b) - SDK v$packageVersion');
+            return Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Text('App Version: '),
+                Expanded(
+                  child: Text(
+                    '$v-$f ($b) - SDK v$packageVersion',
+                    style: const TextStyle(fontWeight: FontWeight.bold),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+        const SizedBox(height: StyleConstants.linear16),
       ],
     );
   }
@@ -344,36 +395,11 @@ class ConnectPageState extends State<ConnectPage> {
       optionalNamespaces: optionalNamespaces,
     );
 
-    final encodedUri = Uri.encodeComponent(connectResponse.uri.toString());
-    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-    flavor = flavor.replaceAll('-production', '');
-    final uri = 'wcflutterwallet$flavor://wc?uri=$encodedUri';
-    if (await canLaunchUrlString(uri)) {
-      final openApp = await showDialog(
-        // ignore: use_build_context_synchronously
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            content: const Text('Do you want to open with Flutter Wallet'),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(false),
-                child: const Text('Show QR'),
-              ),
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(true),
-                child: const Text('Open'),
-              ),
-            ],
-          );
-        },
-      );
-      if (openApp) {
-        launchUrlString(uri, mode: LaunchMode.externalApplication);
-      } else {
-        _showQrCode(connectResponse.uri.toString());
-      }
-    } else {
+    try {
+      final encodedUri = Uri.encodeComponent(connectResponse.uri.toString());
+      final uri = '$_testWalletScheme?uri=$encodedUri';
+      await WalletConnectUtils.openURL(uri);
+    } catch (e) {
       _showQrCode(connectResponse.uri.toString());
     }
 
@@ -384,7 +410,7 @@ class ConnectPageState extends State<ConnectPage> {
     closeModal?.call();
   }
 
-  Future<void> _showQrCode(String uri) async {
+  Future<void> _showQrCode(String uri, {String walletScheme = ''}) async {
     // Show the QR code
     debugPrint('[SampleDapp] Showing QR Code: $uri');
     _shouldDismissQrCode = true;
@@ -425,7 +451,10 @@ class ConnectPageState extends State<ConnectPage> {
       context,
       MaterialPageRoute(
         fullscreenDialog: true,
-        builder: (context) => QRCodeScreen(uri: uri),
+        builder: (context) => QRCodeScreen(
+          uri: uri,
+          walletScheme: walletScheme,
+        ),
       ),
     );
   }
@@ -467,20 +496,13 @@ class ConnectPageState extends State<ConnectPage> {
         pairingTopic: pairingTopic,
         params: AuthRequestParams(
           chainId: 'eip155:1',
-          domain: Constants.domain,
-          aud: Constants.aud,
+          domain: Uri.parse(widget.web3App.metadata.url).authority,
+          aud: widget.web3App.metadata.url,
           statement: 'Welcome to example flutter app',
         ),
       );
 
-      final scheme = event?.session.peer.metadata.redirect?.native;
-      String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-      flavor = flavor.replaceAll('-production', '');
-      launchUrlString(
-        scheme ?? 'wcflutterwallet$flavor://',
-        mode: LaunchMode.externalApplication,
-      );
-
+      widget.web3App.redirectToWallet(event?.session.peer.metadata);
       debugPrint('[SampleDapp] Awaiting authentication response');
       final response = await authResponse.completer.future;
       if (response.result != null) {
@@ -495,55 +517,55 @@ class ConnectPageState extends State<ConnectPage> {
     }
   }
 
-  void _oneClickAuth({
+  String? _testWalletLink() {
+    if (widget.web3App.metadata.redirect?.linkMode == true) {
+      return 'https://lab.web3modal.com/wallet';
+      // Uri link = Uri.parse('https://lab.web3modal.com/flutter_walletkit');
+      // if (_flavor.isNotEmpty) {
+      //   return link
+      //       .replace(path: '${link.path}_internal')
+      //       .replace(host: 'dev.${link.host}')
+      //       .toString();
+      // }
+      // return link.toString();
+    }
+    return null;
+  }
+
+  String get _testWalletScheme {
+    return 'walletapp://wc';
+    // return 'wcflutterwallet$_flavor://wc';
+  }
+
+  void _sessionAuthenticate({
     VoidCallback? closeModal,
     Function(String message)? showToast,
   }) async {
     final methods1 = requiredNamespaces['eip155']?.methods ?? [];
     final methods2 = optionalNamespaces['eip155']?.methods ?? [];
-    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-    flavor = flavor.replaceAll('-production', '');
+    final walletUniversalLink = _testWalletLink();
     final authResponse = await widget.web3App.authenticate(
       params: SessionAuthRequestParams(
         chains: _selectedChains.map((e) => e.chainId).toList(),
-        domain: 'wcflutterdapp$flavor://',
+        domain: Uri.parse(widget.web3App.metadata.url).authority,
         nonce: AuthUtils.generateNonce(),
-        uri: Constants.aud,
+        uri: widget.web3App.metadata.url,
         statement: 'Welcome to example flutter app',
         methods: <String>{...methods1, ...methods2}.toList(),
       ),
+      walletUniversalLink: walletUniversalLink,
     );
 
-    final encodedUri = Uri.encodeComponent(authResponse.uri.toString());
-    final uri = 'wcflutterwallet$flavor://wc?uri=$encodedUri';
-
-    if (await canLaunchUrlString(uri)) {
-      final openApp = await showDialog(
-        // ignore: use_build_context_synchronously
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            content: const Text('Do you want to open with Flutter Wallet'),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(false),
-                child: const Text('Show QR'),
-              ),
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(true),
-                child: const Text('Open'),
-              ),
-            ],
-          );
-        },
+    try {
+      debugPrint('[SampleDapp] authResponse.uri ${authResponse.uri}');
+      await WalletConnectUtils.openURL(authResponse.uri.toString());
+    } catch (e) {
+      // final encodedUri = Uri.encodeComponent(uri);
+      // await WalletConnectUtils.openURL('$_testWalletScheme?uri=$encodedUri');
+      _showQrCode(
+        authResponse.uri.toString(),
+        walletScheme: _testWalletScheme,
       );
-      if (openApp) {
-        launchUrlString(uri, mode: LaunchMode.externalApplication);
-      } else {
-        _showQrCode(authResponse.uri.toString());
-      }
-    } else {
-      _showQrCode(authResponse.uri.toString());
     }
 
     try {
@@ -568,9 +590,7 @@ class ConnectPageState extends State<ConnectPage> {
   void _onSessionConnect(SessionConnect? event) async {
     if (event == null) return;
 
-    setState(() {
-      _selectedChains.clear();
-    });
+    setState(() => _selectedChains.clear());
 
     if (_shouldDismissQrCode && Navigator.canPop(context)) {
       _shouldDismissQrCode = false;
@@ -585,6 +605,12 @@ class ConnectPageState extends State<ConnectPage> {
     );
   }
 
+  // ignore: unused_element
+  String get _flavor {
+    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
+    return flavor.replaceAll('-production', '');
+  }
+
   ButtonStyle get _buttonStyle => ButtonStyle(
         backgroundColor: MaterialStateProperty.resolveWith<Color>(
           (states) {
@@ -609,8 +635,13 @@ class ConnectPageState extends State<ConnectPage> {
 }
 
 class QRCodeScreen extends StatefulWidget {
-  const QRCodeScreen({super.key, required this.uri});
+  const QRCodeScreen({
+    super.key,
+    required this.uri,
+    this.walletScheme = '',
+  });
   final String uri;
+  final String walletScheme;
 
   @override
   State<QRCodeScreen> createState() => _QRCodeScreenState();
@@ -624,6 +655,7 @@ class _QRCodeScreenState extends State<QRCodeScreen> {
         appBar: AppBar(title: const Text(StringConstants.scanQrCode)),
         body: _QRCodeView(
           uri: widget.uri,
+          walletScheme: widget.walletScheme,
         ),
       ),
     );
@@ -631,8 +663,12 @@ class _QRCodeScreenState extends State<QRCodeScreen> {
 }
 
 class _QRCodeView extends StatelessWidget {
-  const _QRCodeView({required this.uri});
+  const _QRCodeView({
+    required this.uri,
+    this.walletScheme = '',
+  });
   final String uri;
+  final String walletScheme;
 
   @override
   Widget build(BuildContext context) {
@@ -656,6 +692,16 @@ class _QRCodeView extends StatelessWidget {
           },
           child: const Text('Copy URL to Clipboard'),
         ),
+        Visibility(
+          visible: walletScheme.isNotEmpty,
+          child: ElevatedButton(
+            onPressed: () async {
+              final encodedUri = Uri.encodeComponent(uri);
+              await WalletConnectUtils.openURL('$walletScheme?uri=$encodedUri');
+            },
+            child: const Text('Open Test Wallet'),
+          ),
+        ),
       ],
     );
   }
diff --git a/example/dapp/lib/widgets/pairing_item.dart b/example/dapp/lib/widgets/pairing_item.dart
index 4ed2dd02..9d503de9 100644
--- a/example/dapp/lib/widgets/pairing_item.dart
+++ b/example/dapp/lib/widgets/pairing_item.dart
@@ -38,6 +38,7 @@ class PairingItem extends StatelessWidget {
             Text(
               pairing.peerMetadata?.url ?? 'Expiry: $expiryDate ($inDays days)',
             ),
+            Text(pairing.topic),
           ],
         ),
       ),
diff --git a/example/dapp/lib/widgets/session_widget.dart b/example/dapp/lib/widgets/session_widget.dart
index 1f20a008..7c9888fb 100644
--- a/example/dapp/lib/widgets/session_widget.dart
+++ b/example/dapp/lib/widgets/session_widget.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
 import 'package:walletconnect_flutter_v2_dapp/models/chain_metadata.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/constants.dart';
@@ -265,13 +264,7 @@ class SessionWidgetState extends State<SessionWidget> {
 
   void _launchWallet() {
     if (kIsWeb) return;
-    final walletUrl = widget.session.peer.metadata.redirect?.native;
-    if ((walletUrl ?? '').isNotEmpty) {
-      launchUrlString(
-        walletUrl!,
-        mode: LaunchMode.externalApplication,
-      );
-    }
+    widget.web3App.redirectToWallet(widget.session.peer.metadata);
   }
 
   List<Widget> _buildSepoliaButtons(String address, String chainId) {
diff --git a/example/wallet/ios/Runner.xcodeproj/project.pbxproj b/example/wallet/ios/Runner.xcodeproj/project.pbxproj
index 33a37c12..71e9e489 100644
--- a/example/wallet/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/wallet/ios/Runner.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 
 /* Begin PBXFileReference section */
 		091D8F532C4A7A5000904D6C /* Info-internal.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-internal.plist"; sourceTree = "<group>"; };
+		0978D7E02C6B682E00E3593C /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		125D39D4B09586A7A45C6063 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -99,6 +100,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				0978D7E02C6B682E00E3593C /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -372,6 +374,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -454,6 +457,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
@@ -533,6 +537,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-internal";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -612,6 +617,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -748,6 +754,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -778,6 +785,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
diff --git a/example/wallet/lib/dependencies/deep_link_handler.dart b/example/wallet/lib/dependencies/deep_link_handler.dart
index 33be57ac..6ece9809 100644
--- a/example/wallet/lib/dependencies/deep_link_handler.dart
+++ b/example/wallet/lib/dependencies/deep_link_handler.dart
@@ -1,6 +1,4 @@
 // import 'dart:async';
-import 'dart:developer';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:get_it/get_it.dart';
@@ -14,8 +12,6 @@ class DeepLinkHandler {
   static const _eventChannel = EventChannel(
     'com.walletconnect.flutterwallet/events',
   );
-  // static final _linksController = StreamController<String>.broadcast();
-  // static Stream<String> get onLink => _linksController.stream;
   static final waiting = ValueNotifier<bool>(false);
 
   static void initListener() {
@@ -47,17 +43,15 @@ class DeepLinkHandler {
   static String get host => universalUri.host;
 
   static void _onLink(Object? event) async {
-    log('[SampleWallet] _onLink $event');
     final ev = WalletConnectUtils.getSearchParamFromURL('$event', 'wc_ev');
     if (ev.isNotEmpty) {
-      log('[SampleWallet] is linkMode $event');
+      debugPrint('[SampleWallet] is linkMode $event');
       await _web3wallet.dispatchEnvelope('$event');
     } else {
       final decodedUri = Uri.parse(Uri.decodeFull(event.toString()));
       if (decodedUri.isScheme('wc')) {
-        log('[SampleWallet] is legacy uri $decodedUri');
+        debugPrint('[SampleWallet] is legacy uri $decodedUri');
         waiting.value = true;
-        // _linksController.sink.add(decodedUri.toString());
         await _web3wallet.pair(uri: decodedUri);
       } else {
         final uriParam = WalletConnectUtils.getSearchParamFromURL(
@@ -65,10 +59,9 @@ class DeepLinkHandler {
           'uri',
         );
         if (decodedUri.isScheme(nativeUri.scheme) && uriParam.isNotEmpty) {
-          log('[SampleWallet] is custom uri $decodedUri');
+          debugPrint('[SampleWallet] is custom uri $decodedUri');
           waiting.value = true;
           final pairingUri = decodedUri.query.replaceFirst('uri=', '');
-          // _linksController.sink.add(pairingUri);
           await _web3wallet.pair(uri: Uri.parse(pairingUri));
         }
       }
diff --git a/example/wallet/lib/dependencies/key_service/key_service.dart b/example/wallet/lib/dependencies/key_service/key_service.dart
index abfc0be1..e4412238 100644
--- a/example/wallet/lib/dependencies/key_service/key_service.dart
+++ b/example/wallet/lib/dependencies/key_service/key_service.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:convert/convert.dart';
 import 'package:flutter/foundation.dart';
@@ -33,7 +32,7 @@ class KeyService extends IKeyService {
       debugPrint(s.toString());
     }
 
-    log('[$runtimeType] _keys $_keys');
+    debugPrint('[$runtimeType] _keys $_keys');
     return _keys;
   }
 
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 900d8854..7e3c6796 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -144,9 +144,11 @@ class Web3WalletService extends IWeb3WalletService {
   }
 
   void _logListener(LogEvent event) {
-    debugPrint('[Logger] ${event.level.name}: ${event.message}');
-    if (event.level == Level.error) {
+    if (event.level == Level.debug) {
       // TODO send to mixpanel
+      log('${event.message}');
+    } else {
+      debugPrint('${event.message}');
     }
   }
 
@@ -182,7 +184,7 @@ class Web3WalletService extends IWeb3WalletService {
   void _onRelayClientMessage(MessageEvent? event) async {
     if (event != null) {
       final jsonObject = await EthUtils.decodeMessageEvent(event);
-      log('[SampleWallet] _onRelayClientMessage $jsonObject');
+      debugPrint('[SampleWallet] _onRelayClientMessage $jsonObject');
       if (jsonObject is JsonRpcRequest) {
         DeepLinkHandler.waiting.value = _loaderMethods.contains(
           jsonObject.method,
@@ -192,8 +194,8 @@ class Web3WalletService extends IWeb3WalletService {
   }
 
   void _onSessionProposal(SessionProposalEvent? args) async {
+    debugPrint('[SampleWallet] _onSessionProposal ${jsonEncode(args?.params)}');
     if (args != null) {
-      log('[SampleWallet] _onSessionProposal ${jsonEncode(args.params)}');
       final result = (await _bottomSheetHandler.queueBottomSheet(
             widget: WCRequestWidget(
               child: WCConnectionRequestWidget(
@@ -242,7 +244,7 @@ class Web3WalletService extends IWeb3WalletService {
   }
 
   void _onSessionProposalError(SessionProposalErrorEvent? args) async {
-    log('[SampleWallet] _onSessionProposalError $args');
+    debugPrint('[SampleWallet] _onSessionProposalError $args');
     DeepLinkHandler.waiting.value = false;
     if (args != null) {
       String errorMessage = args.error.message;
@@ -262,7 +264,8 @@ class Web3WalletService extends IWeb3WalletService {
 
   void _onSessionConnect(SessionConnect? args) {
     if (args != null) {
-      log('[SampleWallet] _onSessionConnect ${jsonEncode(args.session.toJson())}');
+      final session = jsonEncode(args.session.toJson());
+      debugPrint('[SampleWallet] _onSessionConnect $session');
       MethodsUtils.goBackToDapp(args.session.topic, 'success');
     }
   }
@@ -280,9 +283,10 @@ class Web3WalletService extends IWeb3WalletService {
   }
 
   void _onSessionAuthRequest(SessionAuthRequest? args) async {
-    log('[SampleWallet] _onSessionAuthRequest ${jsonEncode(args?.authPayload.toJson())}');
     if (args != null) {
       final SessionAuthPayload authPayload = args.authPayload;
+      final jsonPyaload = jsonEncode(authPayload.toJson());
+      debugPrint('[SampleWallet] _onSessionAuthRequest $jsonPyaload');
       final supportedChains = ChainData.eip155Chains.map((e) => e.chainId);
       final supportedMethods = SupportedEVMMethods.values.map((e) => e.name);
       final newAuthPayload = AuthSignature.populateAuthPayload(
@@ -374,9 +378,8 @@ class Web3WalletService extends IWeb3WalletService {
   }
 
   Future<void> _onAuthRequest(AuthRequest? args) async {
-    log('[SampleWallet] _onAuthRequest $args');
     if (args != null) {
-      //
+      debugPrint('[SampleWallet] _onAuthRequest $args');
       final WCBottomSheetResult rs =
           (await _bottomSheetHandler.queueBottomSheet(
                 widget: WCRequestWidget(
diff --git a/lib/apis/core/core.dart b/lib/apis/core/core.dart
index 4fede26c..8f604128 100644
--- a/lib/apis/core/core.dart
+++ b/lib/apis/core/core.dart
@@ -25,8 +25,10 @@ import 'package:walletconnect_flutter_v2/apis/core/store/i_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/i_relay_client.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_pairing.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/shared_prefs_store.dart';
+import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/i_verify.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/verify.dart';
+import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/utils/constants.dart';
 import 'package:walletconnect_flutter_v2/apis/utils/log_level.dart';
 import 'package:walletconnect_flutter_v2/apis/utils/walletconnect_utils.dart';
@@ -70,6 +72,9 @@ class Core implements ICore {
   @override
   late IConnectivity connectivity;
 
+  @override
+  late ILinkModeStore linkModeStore;
+
   Logger _logger = Logger(
     level: Level.off,
     printer: PrettyPrinter(),
@@ -177,6 +182,12 @@ class Core implements ICore {
     connectivity = ConnectivityState(
       core: this,
     );
+    linkModeStore = LinkModeStore(
+      storage: storage,
+      context: StoreVersions.CONTEXT_LINKMODE,
+      version: StoreVersions.VERSION_LINKMODE,
+      fromJson: (dynamic value) => value as List<String>,
+    );
   }
 
   @override
@@ -187,6 +198,24 @@ class Core implements ICore {
     await expirer.init();
     await pairing.init();
     await connectivity.init();
+    await linkModeStore.init();
     heartbeat.init();
   }
+
+  @override
+  Future<void> addLinkModeSupportedApp(String universalLink) async {
+    return await linkModeStore.update(universalLink);
+  }
+
+  @override
+  List<String> getLinkModeSupportedApps() {
+    return linkModeStore.getList();
+  }
+
+  @override
+  void confirmOnlineStateOrThrow() {
+    if (!connectivity.isOnline.value) {
+      throw WalletConnectError(code: -1, message: 'No internet connection');
+    }
+  }
 }
diff --git a/lib/apis/core/crypto/crypto.dart b/lib/apis/core/crypto/crypto.dart
index ca8c7162..f7acb593 100644
--- a/lib/apis/core/crypto/crypto.dart
+++ b/lib/apis/core/crypto/crypto.dart
@@ -134,6 +134,10 @@ class Crypto implements ICrypto {
 
     final String message = jsonEncode(payload);
 
+    if (utils.isTypeTwoEnvelope(params)) {
+      return utils.encodeTypeTwoEnvelope(message: message);
+    }
+
     if (utils.isTypeOneEnvelope(params)) {
       final String selfPublicKey = params.senderPublicKey!;
       final String peerPublicKey = params.receiverPublicKey!;
@@ -168,6 +172,10 @@ class Crypto implements ICrypto {
       receiverPublicKey: options?.receiverPublicKey,
     );
 
+    if (utils.isTypeTwoEnvelope(params)) {
+      return utils.decodeTypeTwoEnvelope(message: encoded);
+    }
+
     if (utils.isTypeOneEnvelope(params)) {
       final String selfPublicKey = params.receiverPublicKey!;
       final String peerPublicKey = params.senderPublicKey!;
@@ -206,6 +214,18 @@ class Crypto implements ICrypto {
     return utils.deserialize(encoded).type;
   }
 
+  // TODO LinkMode: Check if this is needed
+  @override
+  String? getPayloadSenderPublicKey(String encoded) {
+    _checkInitialized();
+
+    final deserialized = utils.deserialize(encoded);
+    if (deserialized.senderPublicKey != null) {
+      return utf8.decode(deserialized.senderPublicKey!);
+    }
+    return null;
+  }
+
   // PRIVATE FUNCTIONS
 
   Future<String> _setPrivateKey(CryptoKeyPair keyPair) async {
diff --git a/lib/apis/core/crypto/crypto_utils.dart b/lib/apis/core/crypto/crypto_utils.dart
index 0cea4127..e7ec5beb 100644
--- a/lib/apis/core/crypto/crypto_utils.dart
+++ b/lib/apis/core/crypto/crypto_utils.dart
@@ -4,6 +4,7 @@ import 'dart:typed_data';
 
 import 'package:convert/convert.dart';
 import 'package:cryptography/cryptography.dart' as dc;
+import 'package:flutter/services.dart';
 import 'package:pointycastle/digests/sha256.dart';
 import 'package:pointycastle/key_derivators/hkdf.dart';
 import 'package:pointycastle/pointycastle.dart' show HkdfParameters;
@@ -155,6 +156,11 @@ class CryptoUtils extends ICryptoUtils {
   }) {
     List<int> l = [type];
 
+    if (type == EncodeOptions.TYPE_2) {
+      l.addAll(sealed);
+      return base64Url.encode(l);
+    }
+
     if (type == EncodeOptions.TYPE_1) {
       if (senderPublicKey == null) {
         throw const WalletConnectError(
@@ -172,9 +178,17 @@ class CryptoUtils extends ICryptoUtils {
     return base64Encode(l);
   }
 
+  String _padEncodeIfNeeded(String encoded) {
+    final padding = encoded.length % 4;
+    if (padding > 0) {
+      encoded += '=' * (4 - padding);
+    }
+    return encoded;
+  }
+
   @override
   EncodingParams deserialize(String encoded) {
-    final Uint8List bytes = base64Decode(encoded);
+    final Uint8List bytes = base64Decode(_padEncodeIfNeeded(encoded));
     final int type = bytes[0];
 
     int index = TYPE_LENGTH;
@@ -186,6 +200,28 @@ class CryptoUtils extends ICryptoUtils {
       );
       index += KEY_LENGTH;
     }
+    if (type == EncodeOptions.TYPE_2) {
+      senderPublicKey = bytes.sublist(
+        index,
+        index + KEY_LENGTH,
+      );
+      // index += KEY_LENGTH;
+
+      Uint8List sealed = bytes.sublist(index);
+      // iv is not used in TYPE_2 envelopes
+      Uint8List iv = Uint8List(IV_LENGTH)
+        ..setAll(0, List.generate(IV_LENGTH, (_) => Random().nextInt(256)));
+      Uint8List ivSealed = bytes.sublist(index);
+
+      return EncodingParams(
+        type,
+        sealed,
+        iv,
+        ivSealed,
+        senderPublicKey: senderPublicKey,
+      );
+    }
+
     Uint8List iv = bytes.sublist(index, index + IV_LENGTH);
     Uint8List ivSealed = bytes.sublist(index);
     index += IV_LENGTH;
@@ -248,4 +284,44 @@ class CryptoUtils extends ICryptoUtils {
         result.senderPublicKey != null &&
         result.receiverPublicKey != null;
   }
+
+  @override
+  bool isTypeTwoEnvelope(EncodingValidation result) {
+    return result.type == EncodeOptions.TYPE_2;
+  }
+
+  @override
+  Uint8List encodeTypeByte(int type) {
+    // Convert the integer to its byte representation in base 10
+    String typeString = type.toString();
+    List<int> byteList = typeString.codeUnits;
+
+    // Convert the List<int> to a Uint8List
+    return Uint8List.fromList(byteList);
+  }
+
+  @override
+  int decodeTypeByte(Uint8List byte) {
+    // Convert Uint8List to a string using UTF-16 encoding
+    String typeString = String.fromCharCodes(byte);
+
+    // Convert the string to an integer
+    return int.parse(typeString);
+  }
+
+  @override
+  String encodeTypeTwoEnvelope({required String message}) {
+    // iv is not used in type 2 envelopes
+    Uint8List iv = Uint8List(IV_LENGTH)
+      ..setAll(0, List.generate(IV_LENGTH, (_) => Random().nextInt(256)));
+    Uint8List sealed = utf8.encode(message);
+
+    return serialize(EncodeOptions.TYPE_2, sealed, iv);
+  }
+
+  @override
+  String decodeTypeTwoEnvelope({required String message}) {
+    final EncodingParams deserialized = deserialize(message);
+    return utf8.decode(deserialized.sealed);
+  }
 }
diff --git a/lib/apis/core/crypto/i_crypto.dart b/lib/apis/core/crypto/i_crypto.dart
index de9663e4..8a5018e1 100644
--- a/lib/apis/core/crypto/i_crypto.dart
+++ b/lib/apis/core/crypto/i_crypto.dart
@@ -36,5 +36,7 @@ abstract class ICrypto {
   Future<String> signJWT(String aud);
   int getPayloadType(String encoded);
 
+  String? getPayloadSenderPublicKey(String encoded);
+
   ICryptoUtils getUtils();
 }
diff --git a/lib/apis/core/crypto/i_crypto_utils.dart b/lib/apis/core/crypto/i_crypto_utils.dart
index 5c300938..8e9f8d29 100644
--- a/lib/apis/core/crypto/i_crypto_utils.dart
+++ b/lib/apis/core/crypto/i_crypto_utils.dart
@@ -33,5 +33,16 @@ abstract class ICryptoUtils {
     String? senderPublicKey,
     String? receiverPublicKey,
   });
+
   bool isTypeOneEnvelope(EncodingValidation result);
+
+  bool isTypeTwoEnvelope(EncodingValidation result);
+
+  String encodeTypeTwoEnvelope({required String message});
+
+  String decodeTypeTwoEnvelope({required String message});
+
+  Uint8List encodeTypeByte(int type);
+
+  int decodeTypeByte(Uint8List byte);
 }
diff --git a/lib/apis/core/i_core.dart b/lib/apis/core/i_core.dart
index bb88fbb5..47d4dee1 100644
--- a/lib/apis/core/i_core.dart
+++ b/lib/apis/core/i_core.dart
@@ -6,7 +6,10 @@ import 'package:walletconnect_flutter_v2/apis/core/heartbit/i_heartbeat.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_expirer.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_pairing.dart';
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/i_relay_client.dart';
+// import 'package:walletconnect_flutter_v2/apis/core/store/generic_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/i_store.dart';
+import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart';
+// import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/i_verify.dart';
 
 abstract class ICore {
@@ -28,9 +31,16 @@ abstract class ICore {
   abstract IEcho echo;
   abstract final Logger logger;
   abstract IVerify verify;
+  abstract ILinkModeStore linkModeStore;
+
+  Future<void> start();
+
+  void confirmOnlineStateOrThrow();
+
+  Future<void> addLinkModeSupportedApp(String universalLink);
+
+  List<String> getLinkModeSupportedApps();
 
   void addLogListener(LogCallback callback);
   bool removeLogListener(LogCallback callback);
-
-  Future<void> start();
 }
diff --git a/lib/apis/core/pairing/i_pairing.dart b/lib/apis/core/pairing/i_pairing.dart
index c4894624..266ba820 100644
--- a/lib/apis/core/pairing/i_pairing.dart
+++ b/lib/apis/core/pairing/i_pairing.dart
@@ -3,6 +3,7 @@ import 'package:walletconnect_flutter_v2/apis/core/crypto/crypto_models.dart';
 
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_pairing_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/utils/pairing_models.dart';
+import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/models/json_rpc_error.dart';
 import 'package:walletconnect_flutter_v2/apis/models/json_rpc_request.dart';
@@ -26,7 +27,7 @@ abstract class IPairing {
   Future<void> activate({required String topic});
   void register({
     required String method,
-    required Function(String, JsonRpcRequest) function,
+    required Function(String, JsonRpcRequest, [TransportType]) function,
     required ProtocolType type,
   });
   Future<void> setReceiverPublicKey({
@@ -56,14 +57,19 @@ abstract class IPairing {
     int? id,
     int? ttl,
     EncodeOptions? encodeOptions,
+    String? appLink,
+    bool openUrl = true,
   });
+
   Future<void> sendResult(
     int id,
     String topic,
     String method,
     dynamic result, {
     EncodeOptions? encodeOptions,
+    String? appLink,
   });
+
   Future<void> sendError(
     int id,
     String topic,
@@ -71,9 +77,21 @@ abstract class IPairing {
     JsonRpcError error, {
     EncodeOptions? encodeOptions,
     RpcOptions? rpcOptions,
+    String? appLink,
   });
 
   Future<void> isValidPairingTopic({
     required String topic,
   });
+
+  void dispatchEnvelope({
+    required String topic,
+    required String envelope,
+    required bool sessionExists,
+  });
+
+  // bool isTransportTypeLinkMode({
+  //   required Redirect? self,
+  //   required Redirect? peer,
+  // });
 }
diff --git a/lib/apis/core/pairing/pairing.dart b/lib/apis/core/pairing/pairing.dart
index ce34b7c0..ca226f60 100644
--- a/lib/apis/core/pairing/pairing.dart
+++ b/lib/apis/core/pairing/pairing.dart
@@ -244,7 +244,7 @@ class Pairing implements IPairing {
   @override
   void register({
     required String method,
-    required Function(String, JsonRpcRequest) function,
+    required Function(String, JsonRpcRequest, [TransportType]) function,
     required ProtocolType type,
   }) {
     if (routerMapRequest.containsKey(method)) {
@@ -400,24 +400,21 @@ class Pairing implements IPairing {
   // RELAY COMMUNICATION HELPERS
 
   @override
-  Future sendRequest(
+  Future<dynamic> sendRequest(
     String topic,
     String method,
     dynamic params, {
     int? id,
     int? ttl,
     EncodeOptions? encodeOptions,
+    String? appLink,
+    bool openUrl = true,
   }) async {
-    core.logger.t(
-      'pairing sendRequest, id: $id topic: $topic, method: $method, params: $params, ttl: $ttl',
-    );
-
     final payload = JsonRpcUtils.formatJsonRpcRequest(
       method,
       params,
       id: id,
     );
-    // print('sending request: $payload');
 
     final message = await core.crypto.encode(
       topic,
@@ -429,24 +426,40 @@ class Pairing implements IPairing {
       return;
     }
 
-    RpcOptions opts = MethodConstants.RPC_OPTS[method]!['req']!;
-    if (ttl != null) {
-      opts = opts.copyWith(ttl: ttl);
-    }
-
     // print('adding payload to pending requests: ${payload['id']}');
     final resp = PendingRequestResponse(completer: Completer());
     resp.completer.future.catchError((err) {
       // Catch the error so that it won't throw an uncaught error
     });
     pendingRequests[payload['id']] = resp;
-    // print('sent request');
-    await core.relayClient.publish(
-      topic: topic,
-      message: message,
-      ttl: opts.ttl,
-      tag: opts.tag,
-    );
+
+    if ((appLink ?? '').isNotEmpty) {
+      // during wc_sessionAuthenticate we don't need to openURL as it will be done by the host dapp
+      if (openUrl) {
+        final redirectURL = WalletConnectUtils.getLinkModeURL(
+          appLink!,
+          topic,
+          message,
+        );
+        core.logger.t(
+          'pairing sendRequest LinkMode, '
+          'id: $id topic: $topic, method: $method, params: $params, ttl: $ttl',
+        );
+        await WalletConnectUtils.openURL(redirectURL);
+      }
+    } else {
+      core.logger.t(
+        'pairing sendRequest Relay, '
+        'id: $id topic: $topic, method: $method, params: $params, ttl: $ttl',
+      );
+      RpcOptions opts = MethodConstants.RPC_OPTS[method]!['req']!;
+      await core.relayClient.publish(
+        topic: topic,
+        message: message,
+        ttl: ttl ?? opts.ttl,
+        tag: opts.tag,
+      );
+    }
 
     // Get the result from the completer, if it's an error, throw it
     try {
@@ -466,21 +479,19 @@ class Pairing implements IPairing {
   }
 
   @override
-  Future<void> sendResult(
+  Future<dynamic> sendResult(
     int id,
     String topic,
     String method,
     dynamic result, {
     EncodeOptions? encodeOptions,
+    String? appLink,
   }) async {
-    core.logger.t(
-      'pairing sendResult, id: $id topic: $topic, method: $method, result: $result',
-    );
-    final Map<String, dynamic> payload =
-        JsonRpcUtils.formatJsonRpcResponse<dynamic>(
+    final payload = JsonRpcUtils.formatJsonRpcResponse<dynamic>(
       id,
       result,
     );
+
     final String? message = await core.crypto.encode(
       topic,
       payload,
@@ -491,32 +502,47 @@ class Pairing implements IPairing {
       return;
     }
 
-    final RpcOptions opts = MethodConstants.RPC_OPTS[method]!['res']!;
-    await core.relayClient.publish(
-      topic: topic,
-      message: message,
-      ttl: opts.ttl,
-      tag: opts.tag,
-    );
+    if ((appLink ?? '').isNotEmpty) {
+      final redirectURL = WalletConnectUtils.getLinkModeURL(
+        appLink!,
+        topic,
+        message,
+      );
+      core.logger.t(
+        'pairing sendResult LinkMode, '
+        'id: $id topic: $topic, method: $method, result: $result',
+      );
+      await WalletConnectUtils.openURL(redirectURL);
+    } else {
+      final RpcOptions opts = MethodConstants.RPC_OPTS[method]!['res']!;
+      core.logger.t(
+        'pairing sendResult Relay, '
+        'id: $id topic: $topic, method: $method, result: $result',
+      );
+      await core.relayClient.publish(
+        topic: topic,
+        message: message,
+        ttl: opts.ttl,
+        tag: opts.tag,
+      );
+    }
   }
 
   @override
-  Future<void> sendError(
+  Future<dynamic> sendError(
     int id,
     String topic,
     String method,
     JsonRpcError error, {
     EncodeOptions? encodeOptions,
     RpcOptions? rpcOptions,
+    String? appLink,
   }) async {
-    core.logger.t(
-      'pairing sendError, id: $id topic: $topic, method: $method, error: $error',
-    );
-
     final Map<String, dynamic> payload = JsonRpcUtils.formatJsonRpcError(
       id,
       error,
     );
+
     final String? message = await core.crypto.encode(
       topic,
       payload,
@@ -527,19 +553,34 @@ class Pairing implements IPairing {
       return;
     }
 
-    final fallbackMethod = MethodConstants.UNREGISTERED_METHOD;
-    final fallbackRpcOpts = MethodConstants.RPC_OPTS[method] ??
-        MethodConstants.RPC_OPTS[fallbackMethod]!;
-    final fallbackOpts = fallbackRpcOpts['reject'] ?? fallbackRpcOpts['res']!;
-
-    final RpcOptions opts = rpcOptions ?? fallbackOpts;
-
-    await core.relayClient.publish(
-      topic: topic,
-      message: message,
-      ttl: opts.ttl,
-      tag: opts.tag,
-    );
+    if ((appLink ?? '').isNotEmpty) {
+      final redirectURL = WalletConnectUtils.getLinkModeURL(
+        appLink!,
+        topic,
+        message,
+      );
+      core.logger.t(
+        'pairing sendError LinkMode, '
+        'id: $id topic: $topic, method: $method, error: $error',
+      );
+      await WalletConnectUtils.openURL(redirectURL);
+    } else {
+      final fallbackMethod = MethodConstants.UNREGISTERED_METHOD;
+      final methodOpts = MethodConstants.RPC_OPTS[method];
+      final fallbackMethodOpts = MethodConstants.RPC_OPTS[fallbackMethod]!;
+      final relayOpts = methodOpts ?? fallbackMethodOpts;
+      final fallbackOpts = relayOpts['reject'] ?? relayOpts['res']!;
+      core.logger.t(
+        'pairing sendError Relay, '
+        'id: $id topic: $topic, method: $method, error: $error',
+      );
+      await core.relayClient.publish(
+        topic: topic,
+        message: message,
+        ttl: (rpcOptions ?? fallbackOpts).ttl,
+        tag: (rpcOptions ?? fallbackOpts).tag,
+      );
+    }
   }
 
   /// ---- Private Helpers ---- ///
@@ -619,6 +660,7 @@ class Pairing implements IPairing {
   void _registerRelayEvents() {
     core.relayClient.onRelayClientConnect.subscribe(_onRelayConnect);
     core.relayClient.onRelayClientMessage.subscribe(_onMessageEvent);
+    core.relayClient.onLinkModeMessage.subscribe(_onMessageEvent);
 
     register(
       method: MethodConstants.WC_PAIRING_PING,
@@ -637,11 +679,37 @@ class Pairing implements IPairing {
     await _resubscribeAll();
   }
 
+  // Future<Map<String, dynamic>?> _decodeMessageEvent(MessageEvent event) async {
+  //   // If we have a reciever public key for the topic, use it
+  //   ReceiverPublicKey? receiverPublicKey =
+  //       topicToReceiverPublicKey.get(event.topic);
+  //   // If there was a public key, delete it. One use.
+  //   if (receiverPublicKey != null) {
+  //     await topicToReceiverPublicKey.delete(event.topic);
+  //   }
+
+  //   // Decode the message
+  //   String? payloadString = await core.crypto.decode(
+  //     event.topic,
+  //     event.message,
+  //     options: DecodeOptions(
+  //       receiverPublicKey: receiverPublicKey?.publicKey,
+  //     ),
+  //   );
+
+  //   if (payloadString == null) {
+  //     return null;
+  //   }
+
+  //   return jsonDecode(payloadString) as Map<String, dynamic>;
+  // }
+
   void _onMessageEvent(MessageEvent? event) async {
     if (event == null) {
       return;
     }
 
+    // Map<String, dynamic>? data = await _decodeMessageEvent(event);
     // If we have a reciever public key for the topic, use it
     ReceiverPublicKey? receiverPublicKey =
         topicToReceiverPublicKey.get(event.topic);
@@ -662,56 +730,94 @@ class Pairing implements IPairing {
     if (payloadString == null) {
       return;
     }
-    // print(payloadString);
 
     Map<String, dynamic> data = jsonDecode(payloadString);
     core.logger.i('Pairing _onMessageEvent, Received data: $data');
 
     // If it's an rpc request, handle it
-    // print('Pairing: Received data: $data');
     if (data.containsKey('method')) {
       final request = JsonRpcRequest.fromJson(data);
+
       if (routerMapRequest.containsKey(request.method)) {
-        routerMapRequest[request.method]!.function(event.topic, request);
+        routerMapRequest[request.method]!.function(
+          event.topic,
+          request,
+          event.transportType,
+        );
       } else {
         _onUnkownRpcMethodRequest(event.topic, request);
       }
-    }
-    // Otherwise handle it as a response
-    else {
+      // Otherwise handle it as a response
+    } else {
       final response = JsonRpcResponse.fromJson(data);
+      core.logger.d('[$runtimeType] Relay event response ${jsonEncode(data)}');
 
-      // Only handle the response if we have a record of the request
-      // final JsonRpcRecord? record = history.get(response.id.toString());
-      // // print(record);
-      // if (record == null) {
-      //   return;
-      // }
-
-      // print(
-      //   'pendingRequests: ${pendingRequests.keys} has ${response.id} is ${pendingRequests.containsKey(response.id)}',
-      // );
       if (pendingRequests.containsKey(response.id)) {
         if (response.error != null) {
           pendingRequests[response.id]!.error = response.error;
-          pendingRequests[response.id]!
-              .completer
-              .completeError(response.error!);
+          pendingRequests[response.id]!.completer.completeError(
+                response.error!,
+              );
         } else {
-          // print(
-          //   'completing: ${response.result}',
-          // );
           pendingRequests[response.id]!.response = response.result;
           pendingRequests[response.id]!.completer.complete(response.result);
         }
+      } else {
+        // LinkMode's wc_sessionAuthenticate responsed will land here. It's ok.
       }
     }
   }
 
+  // void _onLinkModeEvent(MessageEvent? event) async {
+  //   if (event == null) {
+  //     return;
+  //   }
+
+  //   Map<String, dynamic>? data = await _decodeMessageEvent(event);
+
+  //   if (data == null) {
+  //     return;
+  //   }
+
+  //   core.logger.i('Pairing _onLinkModeEvent, Received data: $data');
+
+  //   // If it's an rpc request, handle it
+  //   if (data.containsKey('method')) {
+  //     final request = JsonRpcRequest.fromJson(data);
+
+  //     if (routerMapRequest.containsKey(request.method)) {
+  //       routerMapRequest[request.method]!.function(
+  //         event.topic,
+  //         request,
+  //         event.transportType,
+  //       );
+  //     } else {
+  //       _onUnkownRpcMethodRequest(event.topic, request);
+  //     }
+  //     // Otherwise handle it as a response
+  //   } else {
+  //     final response = JsonRpcResponse.fromJson(data);
+  //     core.logger.d('[$runtimeType] linkMode event response $response');
+
+  //     if (pendingRequests.containsKey(response.id)) {
+  //       if (response.error != null) {
+  //         pendingRequests[response.id]!.error = response.error;
+  //         pendingRequests[response.id]!.completer.completeError(
+  //               response.error!,
+  //             );
+  //       } else {
+  //         pendingRequests[response.id]!.response = response.result;
+  //         pendingRequests[response.id]!.completer.complete(response.result);
+  //       }
+  //     }
+  //   }
+  // }
+
   Future<void> _onPairingPingRequest(
     String topic,
-    JsonRpcRequest request,
-  ) async {
+    JsonRpcRequest request, [
+    _,
+  ]) async {
     final int id = request.id;
     try {
       // print('ping req');
@@ -741,8 +847,9 @@ class Pairing implements IPairing {
 
   Future<void> _onPairingDeleteRequest(
     String topic,
-    JsonRpcRequest request,
-  ) async {
+    JsonRpcRequest request, [
+    _,
+  ]) async {
     // print('delete');
     final int id = request.id;
     try {
@@ -834,4 +941,16 @@ class Pairing implements IPairing {
   Future<void> _isValidDisconnect(String topic) async {
     await isValidPairingTopic(topic: topic);
   }
+
+  @override
+  void dispatchEnvelope({
+    required String topic,
+    required String envelope,
+    required bool sessionExists,
+  }) async {
+    core.logger.i('[$runtimeType] dispatchEnvelope $topic, $envelope');
+
+    final message = Uri.decodeComponent(envelope);
+    await core.relayClient.handleLinkModeMessage(topic, message);
+  }
 }
diff --git a/lib/apis/core/relay_client/i_relay_client.dart b/lib/apis/core/relay_client/i_relay_client.dart
index a7c38e5b..01031a8c 100644
--- a/lib/apis/core/relay_client/i_relay_client.dart
+++ b/lib/apis/core/relay_client/i_relay_client.dart
@@ -12,10 +12,13 @@ class PublishOptions {
 
 abstract class IRelayClient {
   /// Relay Client Events
-  abstract final Event<MessageEvent> onRelayClientMessage;
   abstract final Event onRelayClientConnect;
   abstract final Event onRelayClientDisconnect;
   abstract final Event<ErrorEvent> onRelayClientError;
+  abstract final Event<MessageEvent> onRelayClientMessage;
+
+  /// LinkMode Events
+  abstract final Event<MessageEvent> onLinkModeMessage;
 
   /// JSON RPC Events
   // Event<EventArgs> onJsonRpcPayload();
@@ -35,14 +38,21 @@ abstract class IRelayClient {
   bool get isConnected;
 
   Future<void> init();
+
   Future<void> publish({
     required String topic,
     required String message,
     required int ttl,
     required int tag,
   });
+
   Future<String> subscribe({required String topic});
+
   Future<void> unsubscribe({required String topic});
+
   Future<void> connect({String? relayUrl});
+
+  Future<bool> handleLinkModeMessage(String topic, String message);
+
   Future<void> disconnect();
 }
diff --git a/lib/apis/core/relay_client/relay_client.dart b/lib/apis/core/relay_client/relay_client.dart
index 8c3f76b3..4ccf9112 100644
--- a/lib/apis/core/relay_client/relay_client.dart
+++ b/lib/apis/core/relay_client/relay_client.dart
@@ -37,6 +37,9 @@ class RelayClient implements IRelayClient {
   @override
   final Event<MessageEvent> onRelayClientMessage = Event<MessageEvent>();
 
+  @override
+  final Event<MessageEvent> onLinkModeMessage = Event<MessageEvent>();
+
   /// Subscriptions
   @override
   final Event<SubscriptionEvent> onSubscriptionCreated =
@@ -170,7 +173,7 @@ class RelayClient implements IRelayClient {
   Future<void> connect({String? relayUrl}) async {
     _checkInitialized();
 
-    core.logger.i('RelayClient: Connecting to relay');
+    core.logger.i('[$runtimeType]: Connecting to relay');
 
     await _connect(relayUrl: relayUrl);
   }
@@ -179,7 +182,7 @@ class RelayClient implements IRelayClient {
   Future<void> disconnect() async {
     _checkInitialized();
 
-    core.logger.i('RelayClient: Disconnecting from relay');
+    core.logger.i('[$runtimeType]: Disconnecting from relay');
 
     await _disconnect();
   }
@@ -207,19 +210,19 @@ class RelayClient implements IRelayClient {
       _subscribeToHeartbeat();
       //
     } on TimeoutException catch (e) {
-      core.logger.d('[$runtimeType] Connect timeout: $e');
+      core.logger.d('[$runtimeType]: Connect timeout: $e');
       onRelayClientError.broadcast(ErrorEvent('Connection to relay timeout'));
       _connecting = false;
       _connect();
     } catch (e) {
-      core.logger.d('[$runtimeType] Connect error: $e');
+      core.logger.d('[$runtimeType]: Connect error: $e');
       onRelayClientError.broadcast(ErrorEvent(e));
       _connecting = false;
     }
   }
 
   Future<void> _disconnect() async {
-    core.logger.t('RelayClient Internal: Disconnecting from relay');
+    core.logger.t('[$runtimeType]: Disconnecting from relay');
     _active = false;
 
     final bool shouldBroadcastDisonnect = isConnected;
@@ -238,7 +241,7 @@ class RelayClient implements IRelayClient {
     _connecting = true;
     _active = true;
     final auth = await core.crypto.signJWT(core.relayUrl);
-    core.logger.t('Signed JWT: $auth');
+    core.logger.t('[$runtimeType]: Signed JWT: $auth');
     final url = WalletConnectUtils.formatRelayRpcUrl(
       protocol: WalletConnectConstants.CORE_PROTOCOL,
       version: WalletConnectConstants.CORE_VERSION,
@@ -254,7 +257,7 @@ class RelayClient implements IRelayClient {
       jsonRPC = null;
     }
 
-    core.logger.t('Initializing WebSocket with $url');
+    core.logger.t('[$runtimeType]: Initializing WebSocket with $url');
     await socketHandler.setup(url: url);
     await socketHandler.connect().timeout(Duration(seconds: 5));
 
@@ -294,17 +297,18 @@ class RelayClient implements IRelayClient {
     );
 
     onRelayClientConnect.broadcast();
-    core.logger.d('[$runtimeType] Connected to relay ${core.relayUrl}');
+    core.logger.d('[$runtimeType]: Connected to relay ${core.relayUrl}');
   }
 
   Future<void> _handleRelayClose(int? code, String? reason) async {
     if (_handledClose) {
-      core.logger.i('Relay close already handled');
+      core.logger.i('[$runtimeType]: Relay close already handled');
       return;
     }
     _handledClose = true;
 
-    core.logger.i('Handling relay close, code: $code, reason: $reason');
+    core.logger.i(
+        '[$runtimeType]: Handling relay close, code: $code, reason: $reason');
     // If the relay isn't active (Disconnected manually), don't do anything
     if (!_active) {
       return;
@@ -352,13 +356,35 @@ class RelayClient implements IRelayClient {
     return '${WalletConnectConstants.RELAYER_DEFAULT_PROTOCOL}_$method';
   }
 
+  // This method could be directly in pairings API
+  // but it's place here for consistency with onRelayClientMessage
+  @override
+  Future<bool> handleLinkModeMessage(String topic, String message) async {
+    core.logger.t('[$runtimeType]: handleLinkModeMessage: $topic, $message');
+
+    // Record a message event
+    // TODO LinkMode probably not needed
+    await messageTracker.recordMessageEvent(topic, message);
+
+    // Broadcast the message
+    onLinkModeMessage.broadcast(
+      MessageEvent(
+        topic,
+        message,
+        DateTime.now().millisecondsSinceEpoch,
+        TransportType.linkMode,
+      ),
+    );
+    return true;
+  }
+
   /// JSON RPC MESSAGE HANDLERS
 
   Future<bool> handlePublish(String topic, String message) async {
-    core.logger.t('Handling Publish Message: $topic, $message');
+    core.logger.t('[$runtimeType]: Handling Publish Message: $topic, $message');
     // If we want to ignore the message, stop
     if (await _shouldIgnoreMessageEvent(topic, message)) {
-      core.logger.w('Ignoring Message: $topic, $message');
+      core.logger.w('[$runtimeType]: Ignoring Message: $topic, $message');
       return false;
     }
 
@@ -370,6 +396,8 @@ class RelayClient implements IRelayClient {
       MessageEvent(
         topic,
         message,
+        DateTime.now().millisecondsSinceEpoch,
+        TransportType.relay,
       ),
     );
     return true;
@@ -386,7 +414,7 @@ class RelayClient implements IRelayClient {
   }
 
   void _handleUnsubscribe(Parameters params) {
-    core.logger.i('[$runtimeType] _handleUnsubscribe $params');
+    core.logger.i('[$runtimeType]: handle unsubscribe $params');
   }
 
   /// MESSAGE HANDLING
diff --git a/lib/apis/sign_api/models/session_models.dart b/lib/apis/sign_api/models/session_models.dart
index 683a707b..43e329f0 100644
--- a/lib/apis/sign_api/models/session_models.dart
+++ b/lib/apis/sign_api/models/session_models.dart
@@ -5,6 +5,8 @@ import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_mod
 import 'package:walletconnect_flutter_v2/apis/core/verify/models/verify_context.dart';
 import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/common_auth_models.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/models/auth/session_auth_events.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/models/json_rpc_models.dart';
 import 'package:walletconnect_flutter_v2/apis/sign_api/models/proposal_models.dart';
 
 part 'session_models.g.dart';
@@ -35,6 +37,26 @@ class SessionProposalCompleter {
   }
 }
 
+class SessionAuthenticateCompleter {
+  final int id;
+  final String pairingTopic;
+  final String responseTopic;
+  final String selfPublicKey;
+  final String? walletUniversalLink;
+  final WcSessionAuthRequestParams request;
+  final Completer<SessionAuthResponse> completer;
+
+  SessionAuthenticateCompleter({
+    required this.id,
+    required this.pairingTopic,
+    required this.responseTopic,
+    required this.selfPublicKey,
+    required this.walletUniversalLink,
+    required this.request,
+    required this.completer,
+  });
+}
+
 @freezed
 class Namespace with _$Namespace {
   @JsonSerializable(includeIfNull: false)
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index 05a61f6a..bc20b268 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -94,6 +94,7 @@ class SignEngine implements ISignEngine {
 
   // FORMER AUTH ENGINE PROPERTY (apparently not used before and not used now)
   List<AuthRequestCompleter> pendingAuthRequests = [];
+  List<SessionAuthenticateCompleter> pendingSessionAuthRequests = [];
 
   SignEngine({
     required this.core,
@@ -156,6 +157,7 @@ class SignEngine implements ISignEngine {
     List<List<String>>? methods = DEFAULT_METHODS,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
 
     await _isValidConnect(
       requiredNamespaces: requiredNamespaces ?? {},
@@ -280,6 +282,7 @@ class SignEngine implements ISignEngine {
     required Uri uri,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
 
     return await core.pairing.pair(
       uri: uri,
@@ -297,6 +300,7 @@ class SignEngine implements ISignEngine {
   }) async {
     // print('sign approveSession');
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
 
     await _isValidApprove(
       id: id,
@@ -358,6 +362,7 @@ class SignEngine implements ISignEngine {
       ),
       peer: proposal.proposer,
       sessionProperties: proposal.sessionProperties,
+      transportType: TransportType.relay,
     );
 
     onSessionConnect.broadcast(SessionConnect(session));
@@ -414,6 +419,7 @@ class SignEngine implements ISignEngine {
     required WalletConnectError reason,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
 
     await _isValidReject(id, reason);
 
@@ -444,6 +450,8 @@ class SignEngine implements ISignEngine {
     required Map<String, Namespace> namespaces,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
+
     await _isValidUpdate(
       topic,
       namespaces,
@@ -466,6 +474,8 @@ class SignEngine implements ISignEngine {
     required String topic,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
+
     await _isValidSessionTopic(topic);
 
     await core.pairing.sendRequest(
@@ -506,16 +516,31 @@ class SignEngine implements ISignEngine {
       chainId,
       request,
     );
+
+    final session = sessions.get(topic);
+    final isLinkMode = _isLinkModeRequest(session);
+    if (!isLinkMode) {
+      _confirmOnlineStateOrThrow();
+    }
+
     return await core.pairing.sendRequest(
       topic,
       MethodConstants.WC_SESSION_REQUEST,
       WcSessionRequestRequest(
         chainId: chainId,
         request: request,
+        transportType: session?.transportType ?? TransportType.relay,
       ),
+      appLink: isLinkMode ? session?.peer.metadata.redirect?.universal : null,
     );
   }
 
+  bool _isLinkModeRequest(SessionData? session) {
+    final appLink = (session?.peer.metadata.redirect?.universal ?? '');
+    final supportedApps = core.getLinkModeSupportedApps();
+    return appLink.isNotEmpty && supportedApps.contains(appLink);
+  }
+
   @override
   Future<List<dynamic>> requestReadContract({
     required DeployedContract deployedContract,
@@ -583,6 +608,14 @@ class SignEngine implements ISignEngine {
     _checkInitialized();
     await _isValidResponse(topic, response);
 
+    final session = sessions.get(topic);
+    final isLinkModeSession = session?.transportType.isLinkMode ?? false;
+    if (!isLinkModeSession) {
+      _confirmOnlineStateOrThrow();
+    }
+
+    final appLink = _getAppLinkIfEnabled(session?.peer.metadata);
+
     // final SessionRequest req = pendingRequests.get(response.id.toString())!;
     // print('respondSessionRequest: ${req.toJson()}');
     if (response.result != null) {
@@ -591,6 +624,7 @@ class SignEngine implements ISignEngine {
         topic,
         MethodConstants.WC_SESSION_REQUEST,
         response.result,
+        appLink: appLink,
       );
     } else {
       await core.pairing.sendError(
@@ -598,6 +632,7 @@ class SignEngine implements ISignEngine {
         topic,
         MethodConstants.WC_SESSION_REQUEST,
         response.error!,
+        appLink: appLink,
       );
     }
 
@@ -624,6 +659,8 @@ class SignEngine implements ISignEngine {
     required SessionEventParams event,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
+
     await _isValidEmit(
       topic,
       event,
@@ -644,6 +681,8 @@ class SignEngine implements ISignEngine {
     required String topic,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
+
     await _isValidPing(topic);
 
     if (sessions.has(topic)) {
@@ -663,6 +702,8 @@ class SignEngine implements ISignEngine {
     required WalletConnectError reason,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
+
     try {
       await _isValidDisconnect(topic);
 
@@ -828,9 +869,10 @@ class SignEngine implements ISignEngine {
     if (!_initialized) {
       throw Errors.getInternalError(Errors.NOT_INITIALIZED);
     }
-    if (!core.connectivity.isOnline) {
-      throw WalletConnectError(code: -1, message: 'No internet connection');
-    }
+  }
+
+  void _confirmOnlineStateOrThrow() {
+    core.confirmOnlineStateOrThrow();
   }
 
   String _getRegisterKey(String chainId, String value) {
@@ -975,17 +1017,17 @@ class SignEngine implements ISignEngine {
       function: _onSessionEventRequest,
       type: ProtocolType.sign,
     );
-    // FORMER AUTH ENGINE PROPERTY
-    core.pairing.register(
-      method: MethodConstants.WC_AUTH_REQUEST,
-      function: _onAuthRequest,
-      type: ProtocolType.sign,
-    );
     core.pairing.register(
       method: MethodConstants.WC_SESSION_AUTHENTICATE,
-      function: _onSessionAuthRequest,
+      function: _onSessionAuthenticateRequest,
       type: ProtocolType.sign,
     );
+    // FORMER AUTH ENGINE PROPERTY
+    // core.pairing.register(
+    //   method: MethodConstants.WC_AUTH_REQUEST,
+    //   function: _onAuthRequest,
+    //   type: ProtocolType.sign,
+    // );
   }
 
   bool _shouldIgnoreSessionPropose(String topic) {
@@ -999,8 +1041,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionProposeRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     if (_shouldIgnoreSessionPropose(topic)) {
       core.logger.t(
         'Session Propose ignored. Session Authenticate will be used instead',
@@ -1109,8 +1152,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionSettleRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     // print('wc session settle');
     final request = WcSessionSettleRequest.fromJson(payload.params);
     try {
@@ -1135,6 +1179,7 @@ class SignEngine implements ISignEngine {
           metadata: metadata,
         ),
         peer: request.controller,
+        transportType: TransportType.relay,
       );
 
       // Update all the things: session, expiry, metadata, pairing
@@ -1142,7 +1187,7 @@ class SignEngine implements ISignEngine {
       _setSessionExpiry(topic, session.expiry);
       await core.pairing.updateMetadata(
         topic: sProposalCompleter.pairingTopic,
-        metadata: request.controller.metadata,
+        metadata: session.peer.metadata,
       );
       final pairing = core.pairing.getPairing(topic: topic);
       if (pairing != null && !pairing.active) {
@@ -1178,8 +1223,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionUpdateRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     try {
       // print(payload.params);
       final request = WcSessionUpdateRequest.fromJson(payload.params);
@@ -1216,8 +1262,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionExtendRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     try {
       final _ = WcSessionExtendRequest.fromJson(payload.params);
       await _isValidSessionTopic(topic);
@@ -1253,8 +1300,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionPingRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     try {
       final _ = WcSessionPingRequest.fromJson(payload.params);
       await _isValidPing(topic);
@@ -1284,8 +1332,9 @@ class SignEngine implements ISignEngine {
 
   Future<void> _onSessionDeleteRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     try {
       final _ = WcSessionDeleteRequest.fromJson(payload.params);
       await _isValidDisconnect(topic);
@@ -1308,10 +1357,14 @@ class SignEngine implements ISignEngine {
     }
   }
 
-  /// Called when a session request is received
+  /// Called when a session request (method) is received by the wallet
   /// Will attempt to find a handler for the request, if it doesn't,
   /// it will throw an error.
-  Future<void> _onSessionRequest(String topic, JsonRpcRequest payload) async {
+  Future<void> _onSessionRequest(
+    String topic,
+    JsonRpcRequest payload, [
+    TransportType transportType = TransportType.relay,
+  ]) async {
     try {
       final request = WcSessionRequestRequest.fromJson(payload.params);
       await _isValidRequest(
@@ -1333,6 +1386,7 @@ class SignEngine implements ISignEngine {
         chainId: request.chainId,
         params: request.request.params,
         verifyContext: verifyContext,
+        transportType: transportType,
       );
 
       // print('payload id: ${payload.id}');
@@ -1341,6 +1395,12 @@ class SignEngine implements ISignEngine {
         sessionRequest,
       );
 
+      final appLink = (session.peer.metadata.redirect?.universal ?? '');
+      if (session.transportType.isLinkMode && appLink.isNotEmpty) {
+        // save app as supported for link mode
+        core.addLinkModeSupportedApp(appLink);
+      }
+
       final methodKey = _getRegisterKey(
         request.chainId,
         request.request.method,
@@ -1394,10 +1454,12 @@ class SignEngine implements ISignEngine {
     }
   }
 
+  /// Called when a session event is received by the wallet
   Future<void> _onSessionEventRequest(
     String topic,
-    JsonRpcRequest payload,
-  ) async {
+    JsonRpcRequest payload, [
+    _,
+  ]) async {
     try {
       final request = WcSessionEventRequest.fromJson(payload.params);
       final SessionEventParams event = request.event;
@@ -1972,6 +2034,7 @@ class SignEngine implements ISignEngine {
     List<List<String>>? methods = DEFAULT_METHODS_AUTH,
   }) async {
     _checkInitialized();
+    _confirmOnlineStateOrThrow();
 
     AuthApiValidators.isValidRequest(params);
     String? pTopic = pairingTopic;
@@ -2007,7 +2070,7 @@ class SignEngine implements ISignEngine {
     final int expiry = params.expiry ?? WalletConnectConstants.FIVE_MINUTES;
 
     await authKeys.set(
-      AuthConstants.AUTH_CLIENT_PUBLIC_KEY_NAME,
+      StringConstants.AUTH_CLIENT_PUBLIC_KEY_NAME,
       AuthPublicKey(publicKey: publicKey),
     );
 
@@ -2130,18 +2193,35 @@ class SignEngine implements ISignEngine {
     return pendingSessionAuthRequests;
   }
 
+  bool _isLinkModeAuthenticate(String? walletLink) {
+    final selfLinkMode = metadata.redirect?.linkMode == true;
+    final selfLink = (metadata.redirect?.universal ?? '');
+    final walletUniversalLink = (walletLink ?? '');
+    return selfLinkMode &&
+        selfLink.isNotEmpty &&
+        walletUniversalLink.isNotEmpty &&
+        core.getLinkModeSupportedApps().contains(walletLink);
+  }
+
   @override
   Future<SessionAuthRequestResponse> authenticate({
     required SessionAuthRequestParams params,
+    String? walletUniversalLink,
     String? pairingTopic,
     List<List<String>>? methods = const [
       [MethodConstants.WC_SESSION_AUTHENTICATE]
     ],
   }) async {
     _checkInitialized();
-
     AuthApiValidators.isValidAuthenticate(params);
 
+    final isLinkMode = _isLinkModeAuthenticate(walletUniversalLink);
+    final transportType =
+        isLinkMode ? TransportType.linkMode : TransportType.relay;
+    if (!transportType.isLinkMode) {
+      _confirmOnlineStateOrThrow();
+    }
+
     final chains = params.chains;
     final resources = params.resources ?? [];
     final requestMethods = params.methods ?? [];
@@ -2164,7 +2244,7 @@ class SignEngine implements ISignEngine {
 
     await Future.wait([
       authKeys.set(
-        AuthConstants.OCAUTH_CLIENT_PUBLIC_KEY_NAME,
+        StringConstants.OCAUTH_CLIENT_PUBLIC_KEY_NAME,
         AuthPublicKey(publicKey: publicKey),
       ),
       pairingTopics.set(responseTopic, pTopic),
@@ -2192,7 +2272,7 @@ class SignEngine implements ISignEngine {
     await core.relayClient.subscribe(topic: responseTopic);
 
     final id = JsonRpcUtils.payloadId();
-    final proposalId = JsonRpcUtils.payloadId();
+    final fallbackId = JsonRpcUtils.payloadId();
 
     // Ensure the expiry is greater than the minimum required for the request - currently 1h
     final method = MethodConstants.WC_SESSION_AUTHENTICATE;
@@ -2211,6 +2291,7 @@ class SignEngine implements ISignEngine {
         metadata: metadata,
       ),
       expiryTimestamp: expiryTimestamp.millisecondsSinceEpoch,
+      transportType: transportType, // TODO LinkMode remove? Ask Nacho
     );
 
     // Set the one time use receiver public key for decoding the Type 1 envelope
@@ -2222,6 +2303,18 @@ class SignEngine implements ISignEngine {
 
     Completer<SessionAuthResponse> completer = Completer();
 
+    // pendingSessionAuthRequests.add(
+    //   SessionAuthenticateCompleter(
+    //     id: id,
+    //     pairingTopic: pTopic,
+    //     responseTopic: responseTopic,
+    //     selfPublicKey: publicKey,
+    //     request: request,
+    //     walletUniversalLink: walletUniversalLink,
+    //     completer: completer,
+    //   ),
+    // );
+
     // ----- build fallback session proposal request ----- //
 
     final fallbackMethod = MethodConstants.WC_SESSION_PROPOSE;
@@ -2230,7 +2323,7 @@ class SignEngine implements ISignEngine {
       Duration(seconds: fallbackOpts.ttl),
     );
     final proposalData = ProposalData(
-      id: proposalId,
+      id: fallbackId,
       requiredNamespaces: {},
       optionalNamespaces: {
         'eip155': RequiredNamespace(
@@ -2259,7 +2352,7 @@ class SignEngine implements ISignEngine {
 
     pendingProposals.add(
       SessionProposalCompleter(
-        id: proposalData.id,
+        id: fallbackId,
         selfPublicKey: proposalData.proposer.publicKey,
         pairingTopic: proposalData.pairingTopic,
         requiredNamespaces: proposalData.requiredNamespaces,
@@ -2269,30 +2362,52 @@ class SignEngine implements ISignEngine {
     );
 
     // ------------------------------------------------------- //
+    late final Uri linkModeUri;
+    if (isLinkMode) {
+      final payload = JsonRpcUtils.formatJsonRpcRequest(
+        method,
+        request.toJson(),
+        id: id,
+      );
+      final message = await core.crypto.encode(
+        pTopic,
+        payload,
+        options: EncodeOptions(type: EncodeOptions.TYPE_2),
+      );
+      linkModeUri = WalletConnectUtils.getLinkModeURL(
+        walletUniversalLink!,
+        pTopic,
+        message!,
+      ).toLinkMode;
+    } else {
+      // Send Session Proposal request (Only when on Relay mode)
+      _connectResponseHandler(
+        pTopic,
+        proposeRequest,
+        fallbackId,
+      );
+    }
 
-    // Send One-Click Auth request
+    // Send One-Click Auth request (When on Relay and LinkMode)
+    // TODO LinkMode: try to reduce the amount of params, maybe using a pendingSessionAuthRequest
     _sessionAuthResponseHandler(
       id: id,
       publicKey: publicKey,
       pairingTopic: pTopic,
       responseTopic: responseTopic,
+      walletUniversalLink: walletUniversalLink,
+      isLinkMode: isLinkMode,
       request: request,
-      expiry: authRequestExpiry,
+      expiry: authRequestExpiry, // TODO remove, use request.expiryTimestamp
       completer: completer,
     );
 
-    // Send Session Proposal request
-    _connectResponseHandler(
-      pTopic,
-      proposeRequest,
-      proposalData.id,
-    );
-
     return SessionAuthRequestResponse(
       id: id,
       pairingTopic: pTopic,
+      // linkModeUri is sent in the response so the host app can trigger it
+      uri: isLinkMode ? linkModeUri : connectionUri,
       completer: completer,
-      uri: connectionUri,
     );
   }
 
@@ -2301,6 +2416,8 @@ class SignEngine implements ISignEngine {
     required String publicKey,
     required String pairingTopic,
     required String responseTopic,
+    required String? walletUniversalLink,
+    required bool isLinkMode,
     required int expiry,
     required WcSessionAuthRequestParams request,
     required Completer<SessionAuthResponse> completer,
@@ -2314,6 +2431,9 @@ class SignEngine implements ISignEngine {
         request.toJson(),
         id: id,
         ttl: expiry,
+        appLink: isLinkMode ? walletUniversalLink : null,
+        // We don't want to open the appLink in this case as it will be opened by the host app
+        openUrl: false,
       );
       result = WcSessionAuthRequestResult.fromJson(response);
     } catch (error) {
@@ -2322,10 +2442,7 @@ class SignEngine implements ISignEngine {
         topic: responseTopic,
         jsonRpcError: (error is JsonRpcError) ? error : null,
         error: (error is! JsonRpcError)
-            ? WalletConnectError(
-                code: -1,
-                message: error.toString(),
-              )
+            ? WalletConnectError(code: -1, message: '$error')
             : null,
       );
       onSessionAuthResponse.broadcast(response);
@@ -2422,11 +2539,12 @@ class SignEngine implements ISignEngine {
           accounts: approvedAccounts,
           methods: approvedMethods,
         ),
+        authentication: cacaos,
+        transportType: request.transportType,
       );
 
       await core.relayClient.subscribe(topic: sessionTopic);
       await sessions.set(sessionTopic, session);
-
       await core.pairing.updateMetadata(
         topic: pairingTopic,
         metadata: responder.metadata,
@@ -2435,6 +2553,24 @@ class SignEngine implements ISignEngine {
       session = sessions.get(sessionTopic);
     }
 
+    // TODO LinkMode: Make this whole block more readable
+    final selfLinkMode = metadata.redirect?.linkMode == true;
+    final responderLinkMode = responder.metadata.redirect?.linkMode == true;
+    final walletLink = (walletUniversalLink ?? '');
+    if (selfLinkMode && responderLinkMode) {
+      if (walletLink.isNotEmpty &&
+          walletLink == responder.metadata.redirect?.universal) {
+        // save wallet link in array of apps that support linkMode
+        await core.addLinkModeSupportedApp(walletUniversalLink!);
+        core.logger
+            .i('[$runtimeType] sessions.update $sessionTopic to linkMode');
+        await sessions.update(
+          sessionTopic,
+          transportType: TransportType.linkMode,
+        );
+      }
+    }
+
     final resp = SessionAuthResponse(
       id: id,
       topic: responseTopic,
@@ -2455,15 +2591,19 @@ class SignEngine implements ISignEngine {
   }) async {
     _checkInitialized();
 
-    Map<int, PendingAuthRequest> pendingRequests = getPendingAuthRequests();
+    final pendingAuthRequests = getPendingAuthRequests();
     AuthApiValidators.isValidRespond(
       id: id,
-      pendingRequests: pendingRequests,
+      pendingRequests: pendingAuthRequests,
       signature: signature,
       error: error,
     );
 
-    final PendingAuthRequest pendingRequest = pendingRequests[id]!;
+    final PendingAuthRequest pendingRequest = pendingAuthRequests[id]!;
+    if (!pendingRequest.transportType.isLinkMode) {
+      _confirmOnlineStateOrThrow();
+    }
+
     final String receiverPublicKey = pendingRequest.metadata.publicKey;
     final String senderPublicKey = await core.crypto.generateKeyPair();
     final String responseTopic = core.crypto.getUtils().hashKey(
@@ -2522,15 +2662,27 @@ class SignEngine implements ISignEngine {
   }) async {
     _checkInitialized();
 
-    final pendingRequests = getPendingSessionAuthRequests();
+    final pendingSessionAuthRequests = getPendingSessionAuthRequests();
+
+    if (!pendingSessionAuthRequests.containsKey(id)) {
+      throw Errors.getInternalError(
+        Errors.MISSING_OR_INVALID,
+        context: 'approveSessionAuthenticate() '
+            'Could not find pending auth request with id $id',
+      );
+    }
 
     AuthApiValidators.isValidRespondAuthenticate(
       id: id,
-      pendingRequests: pendingRequests,
+      pendingRequests: pendingSessionAuthRequests,
       auths: auths,
     );
 
-    final PendingSessionAuthRequest pendingRequest = pendingRequests[id]!;
+    final pendingRequest = pendingSessionAuthRequests[id]!;
+    if (!pendingRequest.transportType.isLinkMode) {
+      _confirmOnlineStateOrThrow();
+    }
+
     final receiverPublicKey = pendingRequest.requester.publicKey;
     final senderPublicKey = await core.crypto.generateKeyPair();
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
@@ -2608,14 +2760,21 @@ class SignEngine implements ISignEngine {
           accounts: approvedAccounts,
           methods: approvedMethods,
         ),
+        authentication: auths,
+        transportType: pendingRequest.transportType,
       );
 
       await core.relayClient.subscribe(topic: sessionTopic);
       await sessions.set(sessionTopic, session);
-
-      session = sessions.get(sessionTopic);
+      await core.pairing.updateMetadata(
+        topic: pendingRequest.pairingTopic,
+        metadata: pendingRequest.requester.metadata,
+      );
     }
 
+    await sessionAuthRequests.delete(id.toString());
+    await core.pairing.activate(topic: pendingRequest.pairingTopic);
+
     final result = WcSessionAuthRequestResult(
       cacaos: auths,
       responder: ConnectionMetadata(
@@ -2629,13 +2788,7 @@ class SignEngine implements ISignEngine {
       MethodConstants.WC_SESSION_AUTHENTICATE,
       result.toJson(),
       encodeOptions: encodeOpts,
-    );
-
-    await sessionAuthRequests.delete(id.toString());
-    await core.pairing.activate(topic: pendingRequest.pairingTopic);
-    await core.pairing.updateMetadata(
-      topic: pendingRequest.pairingTopic,
-      metadata: pendingRequest.requester.metadata,
+      appLink: _getAppLinkIfEnabled(pendingRequest.requester.metadata),
     );
 
     return ApproveResponse(
@@ -2651,17 +2804,21 @@ class SignEngine implements ISignEngine {
   }) async {
     _checkInitialized();
 
-    final pendingRequests = getPendingSessionAuthRequests();
+    final pendingSessionAuthRequests = getPendingSessionAuthRequests();
 
-    if (!pendingRequests.containsKey(id)) {
+    if (!pendingSessionAuthRequests.containsKey(id)) {
       throw Errors.getInternalError(
         Errors.MISSING_OR_INVALID,
-        context:
-            'rejectSessionAuthenticate() Could not find pending auth request with id $id',
+        context: 'rejectSessionAuthenticate() '
+            'Could not find pending auth request with id $id',
       );
     }
 
-    final PendingSessionAuthRequest pendingRequest = pendingRequests[id]!;
+    final pendingRequest = pendingSessionAuthRequests[id]!;
+    if (!pendingRequest.transportType.isLinkMode) {
+      _confirmOnlineStateOrThrow();
+    }
+
     final receiverPublicKey = pendingRequest.requester.publicKey;
     final senderPublicKey = await core.crypto.generateKeyPair();
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
@@ -2681,6 +2838,7 @@ class SignEngine implements ISignEngine {
       JsonRpcError(code: reason.code, message: reason.message),
       encodeOptions: encodeOpts,
       rpcOptions: rpcOpts?['reject'],
+      appLink: _getAppLinkIfEnabled(pendingRequest.requester.metadata),
     );
 
     await sessionAuthRequests.delete(id.toString());
@@ -2688,7 +2846,12 @@ class SignEngine implements ISignEngine {
   }
 
   // FORMER AUTH ENGINE PROPERTY
-  void _onAuthRequest(String topic, JsonRpcRequest payload) async {
+  // ignore: unused_element
+  void _onAuthRequest(
+    String topic,
+    JsonRpcRequest payload, {
+    TransportType transportType = TransportType.relay,
+  }) async {
     try {
       final request = WcAuthRequestRequest.fromJson(payload.params);
 
@@ -2704,6 +2867,7 @@ class SignEngine implements ISignEngine {
           pairingTopic: topic,
           metadata: request.requester,
           cacaoPayload: cacaoPayload,
+          transportType: transportType,
         ),
       );
 
@@ -2713,6 +2877,7 @@ class SignEngine implements ISignEngine {
           topic: topic,
           requester: request.requester,
           payloadParams: request.payloadParams,
+          transportType: transportType,
         ),
       );
     } on WalletConnectError catch (err) {
@@ -2727,8 +2892,32 @@ class SignEngine implements ISignEngine {
     }
   }
 
-  void _onSessionAuthRequest(String topic, JsonRpcRequest payload) async {
-    core.logger.t('_onSessionAuthRequest, topic: $topic, payload: $payload');
+  void _onSessionAuthenticateRequest(
+    String topic,
+    JsonRpcRequest payload, [
+    TransportType transportType = TransportType.relay,
+  ]) async {
+    core.logger.t(
+      '_onSessionAuthenticateRequest, topic: $topic, payload: $payload',
+    );
+
+    if (transportType.isLinkMode && !sessions.has(topic)) {
+      final pairingInfo = PairingInfo(
+        topic: topic,
+        expiry: WalletConnectUtils.calculateExpiry(
+          WalletConnectConstants.SEVEN_DAYS,
+        ),
+        relay: Relay(WalletConnectConstants.RELAYER_DEFAULT_PROTOCOL),
+        // Will be activated during approveSessionAuthenticate()
+        // or deleted during rejectSessionAuthenticate()
+        active: false,
+      );
+
+      await pairings.set(topic, pairingInfo);
+      core.logger.t(
+        '[$runtimeType] _onSessionAuthenticateRequest pairingInfo $pairingInfo',
+      );
+    }
 
     final sessionAuthRequest = WcSessionAuthRequestParams.fromJson(
       payload.params,
@@ -2749,9 +2938,17 @@ class SignEngine implements ISignEngine {
           authPayload: cacaoPayload,
           expiryTimestamp: sessionAuthRequest.expiryTimestamp,
           verifyContext: verifyContext,
+          transportType: transportType,
         ),
       );
 
+      final appLink =
+          (sessionAuthRequest.requester.metadata.redirect?.universal ?? '');
+      if (transportType.isLinkMode && appLink.isNotEmpty) {
+        // save app as supported for link mode
+        core.addLinkModeSupportedApp(appLink);
+      }
+
       onSessionAuthRequest.broadcast(
         SessionAuthRequest(
           id: payload.id,
@@ -2759,6 +2956,7 @@ class SignEngine implements ISignEngine {
           requester: sessionAuthRequest.requester,
           authPayload: sessionAuthRequest.authPayload,
           verifyContext: verifyContext,
+          transportType: transportType,
         ),
       );
     } on WalletConnectError catch (err) {
@@ -2781,4 +2979,89 @@ class SignEngine implements ISignEngine {
       );
     }
   }
+
+  @override
+  Future<void> dispatchEnvelope(String url) async {
+    final topic = WalletConnectUtils.getSearchParamFromURL(url, 'topic');
+    final envelope = WalletConnectUtils.getSearchParamFromURL(url, 'wc_ev');
+
+    if (envelope.isEmpty) {
+      throw WalletConnectError(code: 0, message: 'Envelope not found');
+    }
+    if (topic.isEmpty) {
+      throw WalletConnectError(code: 0, message: 'Topic not found');
+    }
+
+    final session = sessions.get(topic);
+    if (session != null) {
+      core.logger.i('[$runtimeType] sessions.update $topic to linkMode');
+      await sessions.update(
+        session.topic,
+        transportType: TransportType.linkMode,
+      );
+    }
+
+    core.pairing.dispatchEnvelope(
+      topic: topic,
+      envelope: envelope,
+      sessionExists: (session != null),
+    );
+  }
+
+  bool _isLinkModeEnabled(PairingMetadata? peerMetadata) {
+    if (peerMetadata == null) return false;
+
+    final selfLink = (metadata.redirect?.universal ?? '');
+    final selfLinkMode = metadata.redirect?.linkMode == true;
+    final peerLink = (peerMetadata.redirect?.universal ?? '');
+    final peerLinkMode = peerMetadata.redirect?.linkMode == true;
+    return selfLinkMode &&
+        selfLink.isNotEmpty &&
+        peerLinkMode &&
+        peerLink.isNotEmpty &&
+        core.getLinkModeSupportedApps().contains(peerLink);
+  }
+
+  String? _getAppLinkIfEnabled(PairingMetadata? peerMetadata) {
+    final isLinkMode = _isLinkModeEnabled(peerMetadata);
+    return isLinkMode ? peerMetadata?.redirect?.universal : null;
+  }
+
+  @override
+  Future<bool> redirectToDapp(PairingMetadata? metadata) {
+    return _callRedirect(metadata);
+  }
+
+  @override
+  Future<bool> redirectToWallet(PairingMetadata? metadata) {
+    return _callRedirect(metadata);
+  }
+
+  Future<bool> _callRedirect(PairingMetadata? metadata) async {
+    if (_isLinkModeEnabled(metadata)) {
+      // linkMode redirection is already handled in the engine
+      return false;
+    }
+
+    final redirect = metadata?.redirect;
+    final scheme = redirect?.native;
+    try {
+      if (scheme == null) {
+        throw WalletConnectError(
+          code: 0,
+          message: 'scheme `$scheme` is invalid',
+        );
+      }
+      final success = await WalletConnectUtils.openURL(scheme);
+      if (!success) {
+        throw WalletConnectError(
+          code: 0,
+          message: 'Can not open $scheme',
+        );
+      }
+      return true;
+    } catch (e) {
+      rethrow;
+    }
+  }
 }
diff --git a/lib/apis/sign_api/utils/auth/auth_constants.dart b/lib/apis/sign_api/utils/auth/auth_constants.dart
index 955e3809..c592bb4e 100644
--- a/lib/apis/sign_api/utils/auth/auth_constants.dart
+++ b/lib/apis/sign_api/utils/auth/auth_constants.dart
@@ -16,6 +16,4 @@ class StringConstants {
 
   static const OCAUTH_CLIENT_PUBLIC_KEY_NAME =
       '$AUTH_STORAGE_PREFIX:$AUTH_CLIENT_PUBLIC_KEY_NAME';
-
-  static const WALLETCONNECT_LINK_MODE_APPS = 'WALLETCONNECT_LINK_MODE_APPS';
 }
diff --git a/lib/apis/utils/constants.dart b/lib/apis/utils/constants.dart
index 5fe844fa..8b67d649 100644
--- a/lib/apis/utils/constants.dart
+++ b/lib/apis/utils/constants.dart
@@ -7,11 +7,16 @@ class WalletConnectConstants {
   static const CORE_VERSION = 2;
   static const CORE_CONTEXT = 'core';
 
-  static const DEFAULT_RELAY_URL = 'wss://relay.walletconnect.org';
-
   static const CORE_STORAGE_PREFIX =
       '$CORE_PROTOCOL@$CORE_VERSION:$CORE_CONTEXT:';
 
+  static const DEFAULT_RELAY_URL = 'wss://relay.walletconnect.org';
+  static const DEFAULT_PUSH_URL = 'https://echo.walletconnect.org';
+  static const VERIFY_SERVER = 'https://verify.walletconnect.org';
+  static const TRUSTED_VERIFY_URLS = [VERIFY_SERVER];
+
+  static const RELAYER_DEFAULT_PROTOCOL = 'irn';
+
   static const THIRTY_SECONDS = 30;
   static const ONE_MINUTE = 60;
   static const FIVE_MINUTES = ONE_MINUTE * 5;
@@ -20,12 +25,7 @@ class WalletConnectConstants {
   static const SEVEN_DAYS = ONE_DAY * 7;
   static const THIRTY_DAYS = ONE_DAY * 30;
 
-  static const RELAYER_DEFAULT_PROTOCOL = 'irn';
-
-  static const DEFAULT_PUSH_URL = 'https://echo.walletconnect.org';
-
-  static const VERIFY_SERVER = 'https://verify.walletconnect.org';
-  static const TRUSTED_VERIFY_URLS = [VERIFY_SERVER];
+  static const WALLETCONNECT_LINK_MODE_APPS = 'WALLETCONNECT_LINK_MODE_APPS';
 }
 
 class StoreVersions {
@@ -45,7 +45,7 @@ class StoreVersions {
   static const CONTEXT_TOPIC_TO_RECEIVER_PUBLIC_KEY =
       'topicToReceiverPublicKey';
   static const VERSION_TOPIC_TO_RECEIVER_PUBLIC_KEY = '1.1';
-  static const CONTEXT_LINKMODE = 'linkmode';
+  static const CONTEXT_LINKMODE = 'linkMode';
   static const VERSION_LINKMODE = '1.0';
 
   // Sign
diff --git a/lib/apis/utils/extensions.dart b/lib/apis/utils/extensions.dart
index 1673d6c4..f56943d8 100644
--- a/lib/apis/utils/extensions.dart
+++ b/lib/apis/utils/extensions.dart
@@ -78,3 +78,7 @@ extension EtheraAmountExtension on String? {
     return null;
   }
 }
+
+extension UriExtension on String {
+  Uri get toLinkMode => Uri.parse(Uri.decodeFull(this));
+}
diff --git a/lib/apis/utils/walletconnect_utils.dart b/lib/apis/utils/walletconnect_utils.dart
index 875b2e8a..ab18bbc0 100644
--- a/lib/apis/utils/walletconnect_utils.dart
+++ b/lib/apis/utils/walletconnect_utils.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:url_launcher/url_launcher_string.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
 class WalletConnectUtils {
@@ -227,4 +228,35 @@ class WalletConnectUtils {
     }
     return m;
   }
+
+  static String getSearchParamFromURL(String url, String param) {
+    final decodedUri = Uri.parse(Uri.decodeFull(url));
+    final hasParam = decodedUri.queryParameters.keys.contains(param);
+    if (!hasParam) return '';
+
+    return Uri.encodeQueryComponent(decodedUri.queryParameters[param]!);
+  }
+
+  static String getLinkModeURL(
+    String universalLink,
+    String topic,
+    String encodedEnvelope,
+  ) {
+    return '$universalLink?wc_ev=$encodedEnvelope&topic=$topic';
+  }
+
+  static Future<bool> openURL(String url) async {
+    try {
+      final success = await launchUrlString(
+        url,
+        mode: LaunchMode.externalApplication,
+      );
+      if (!success) {
+        throw WalletConnectError(code: 0, message: 'Can not open $url');
+      }
+      return true;
+    } catch (e) {
+      rethrow;
+    }
+  }
 }
diff --git a/test/shared/shared_test_utils.mocks.dart b/test/shared/shared_test_utils.mocks.dart
index 140cf278..2dcb8dc7 100644
--- a/test/shared/shared_test_utils.mocks.dart
+++ b/test/shared/shared_test_utils.mocks.dart
@@ -249,9 +249,9 @@ class _FakeIConnectivity_17 extends _i1.SmartFake
         );
 }
 
-class _FakeISupportedLinkModeStore_18 extends _i1.SmartFake
-    implements _i18.ISupportedLinkModeStore {
-  _FakeISupportedLinkModeStore_18(
+class _FakeILinkModeStore_18 extends _i1.SmartFake
+    implements _i18.ILinkModeStore {
+  _FakeILinkModeStore_18(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -1407,20 +1407,19 @@ class MockCore extends _i1.Mock implements _i28.Core {
       );
 
   @override
-  _i18.ISupportedLinkModeStore get linkModeApps => (super.noSuchMethod(
-        Invocation.getter(#linkModeApps),
-        returnValue: _FakeISupportedLinkModeStore_18(
+  _i18.ILinkModeStore get linkModeStore => (super.noSuchMethod(
+        Invocation.getter(#linkModeStore),
+        returnValue: _FakeILinkModeStore_18(
           this,
-          Invocation.getter(#linkModeApps),
+          Invocation.getter(#linkModeStore),
         ),
-      ) as _i18.ISupportedLinkModeStore);
+      ) as _i18.ILinkModeStore);
 
   @override
-  set linkModeApps(_i18.ISupportedLinkModeStore? _linkModeApps) =>
-      super.noSuchMethod(
+  set linkModeStore(_i18.ILinkModeStore? _linkModeStore) => super.noSuchMethod(
         Invocation.setter(
-          #linkModeApps,
-          _linkModeApps,
+          #linkModeStore,
+          _linkModeStore,
         ),
         returnValueForMissingStub: null,
       );

From d600ffe5f586463f034086e121e921f8f34275ca Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 23 Aug 2024 12:35:09 +0200
Subject: [PATCH 04/22] ios completed on both wallet and dapp sides

---
 example/dapp/ios/Runner/Runner.entitlements   | 11 ++++
 example/dapp/lib/utils/deep_link_handler.dart | 59 +++++++++++++++++++
 .../core/store/supported_linkmode_store.dart  | 46 +++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 example/dapp/ios/Runner/Runner.entitlements
 create mode 100644 example/dapp/lib/utils/deep_link_handler.dart
 create mode 100644 lib/apis/core/store/supported_linkmode_store.dart

diff --git a/example/dapp/ios/Runner/Runner.entitlements b/example/dapp/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..84ca64b5
--- /dev/null
+++ b/example/dapp/ios/Runner/Runner.entitlements
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:lab.web3modal.com</string>
+		<string>applinks:dev.lab.web3modal.com</string>
+	</array>
+</dict>
+</plist>
diff --git a/example/dapp/lib/utils/deep_link_handler.dart b/example/dapp/lib/utils/deep_link_handler.dart
new file mode 100644
index 00000000..8c3dc867
--- /dev/null
+++ b/example/dapp/lib/utils/deep_link_handler.dart
@@ -0,0 +1,59 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:walletconnect_flutter_v2_dapp/imports.dart';
+
+class DeepLinkHandler {
+  static const _methodChannel = MethodChannel(
+    'com.walletconnect.flutterwallet/methods',
+  );
+  static const _eventChannel = EventChannel(
+    'com.walletconnect.flutterwallet/events',
+  );
+  static final waiting = ValueNotifier<bool>(false);
+  static late IWeb3App _web3app;
+
+  static void initListener() {
+    if (kIsWeb) return;
+    _eventChannel.receiveBroadcastStream().listen(
+          _onLink,
+          onError: _onError,
+        );
+  }
+
+  static void init(IWeb3App web3app) {
+    if (kIsWeb) return;
+    _web3app = web3app;
+  }
+
+  static void checkInitialLink() {
+    if (kIsWeb) return;
+    try {
+      _methodChannel.invokeMethod('initialLink').then(
+            _onLink,
+            onError: _onError,
+          );
+    } catch (e) {
+      debugPrint('[SampleWallet] [DeepLinkHandler] checkInitialLink $e');
+    }
+  }
+
+  static Uri get nativeUri =>
+      Uri.parse(_web3app.metadata.redirect?.native ?? '');
+  static Uri get universalUri =>
+      Uri.parse(_web3app.metadata.redirect?.universal ?? '');
+  static String get host => universalUri.host;
+
+  static void _onLink(dynamic link) async {
+    if (link == null) return;
+    final envelope = WalletConnectUtils.getSearchParamFromURL(link, 'wc_ev');
+    if (envelope.isNotEmpty) {
+      debugPrint('[SampleDapp] is linkMode $link');
+      await _web3app.dispatchEnvelope(link);
+    }
+  }
+
+  static void _onError(dynamic error) {
+    debugPrint('[SampleDapp] _onError $error');
+    waiting.value = false;
+  }
+}
diff --git a/lib/apis/core/store/supported_linkmode_store.dart b/lib/apis/core/store/supported_linkmode_store.dart
new file mode 100644
index 00000000..e55abb19
--- /dev/null
+++ b/lib/apis/core/store/supported_linkmode_store.dart
@@ -0,0 +1,46 @@
+import 'package:walletconnect_flutter_v2/apis/core/store/generic_store.dart';
+import 'package:walletconnect_flutter_v2/apis/core/store/i_generic_store.dart';
+import 'package:walletconnect_flutter_v2/apis/utils/constants.dart';
+
+abstract class ILinkModeStore extends IGenericStore<List<String>> {
+  Future<void> update(String url);
+  List<String> getList();
+}
+
+class LinkModeStore extends GenericStore<List<String>>
+    implements ILinkModeStore {
+  //
+  LinkModeStore({
+    required super.storage,
+    required super.context,
+    required super.version,
+    required super.fromJson,
+  });
+
+  static const _key = WalletConnectConstants.WALLETCONNECT_LINK_MODE_APPS;
+
+  @override
+  Future<void> update(String url) async {
+    checkInitialized();
+
+    final currentList = getList();
+    if (!currentList.contains(url)) {
+      final newList = List<String>.from([...currentList, url]);
+      await storage.set(_key, {_key: newList});
+    }
+  }
+
+  @override
+  List<String> getList() {
+    checkInitialized();
+
+    if (storage.has(_key)) {
+      final storageValue = storage.get(_key)!;
+      if (storageValue.keys.contains(_key)) {
+        final currentList = (storageValue[_key] as List);
+        return currentList.map((e) => '$e').toList();
+      }
+    }
+    return [];
+  }
+}

From 31f5b75df2388db91b4ea0e513ad72beabcf79b0 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 23 Aug 2024 20:31:59 +0200
Subject: [PATCH 05/22] Android side

---
 .../android/app/src/main/AndroidManifest.xml  |  50 ++-
 .../kotlin/com/example/dapp/MainActivity.kt   |  59 ++++
 example/dapp/ios/Runner/AppDelegate.swift     |   4 +-
 example/dapp/lib/main.dart                    |   1 -
 example/dapp/lib/pages/connect_page.dart      | 333 +++++++-----------
 example/dapp/lib/utils/deep_link_handler.dart |  16 +-
 example/dapp/lib/widgets/method_dialog.dart   |   2 +
 example/dapp/pubspec.yaml                     |   2 -
 example/wallet/ios/Runner/AppDelegate.swift   |   5 +-
 .../bottom_sheet/bottom_sheet_listener.dart   |   2 +
 .../lib/dependencies/web3wallet_service.dart  |   2 +-
 example/wallet/lib/pages/settings_page.dart   |   5 +-
 .../android/build.gradle                      |   2 +-
 example/wallet/pubspec.yaml                   |   1 -
 lib/apis/core/pairing/pairing.dart            |   8 +-
 lib/apis/sign_api/sign_engine.dart            |   2 +-
 16 files changed, 257 insertions(+), 237 deletions(-)

diff --git a/example/dapp/android/app/src/main/AndroidManifest.xml b/example/dapp/android/app/src/main/AndroidManifest.xml
index 1834973a..42154613 100644
--- a/example/dapp/android/app/src/main/AndroidManifest.xml
+++ b/example/dapp/android/app/src/main/AndroidManifest.xml
@@ -1,18 +1,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
         </intent>
-        <package android:name="com.walletconnect.flutterwallet"/>
-        <package android:name="com.walletconnect.flutterwallet.internal"/>
+
+        <package android:name="com.walletconnect.flutterwallet" />
+        <package android:name="com.walletconnect.flutterwallet.internal" />
     </queries>
-   <application
-       android:label="${applicationLabel}"
-       android:name="${applicationName}"
-       android:icon="${appIcon}">
+    <application
+        android:label="${applicationLabel}"
+        android:name="${applicationName}"
+        android:icon="${appIcon}">
         <activity
             android:name="com.example.dapp.MainActivity"
             android:exported="true"
@@ -27,25 +29,49 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="wcflutterdapp" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="wcflutterdapp-internal" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="lab.web3modal.com" />
+                <data android:pathPattern="/flutter_appkit" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="dev.lab.web3modal.com" />
+                <data android:pathPattern="/flutter_appkit_internal" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/example/dapp/android/app/src/main/kotlin/com/example/dapp/MainActivity.kt b/example/dapp/android/app/src/main/kotlin/com/example/dapp/MainActivity.kt
index db5869cd..c531c201 100644
--- a/example/dapp/android/app/src/main/kotlin/com/example/dapp/MainActivity.kt
+++ b/example/dapp/android/app/src/main/kotlin/com/example/dapp/MainActivity.kt
@@ -1,6 +1,65 @@
 package com.example.dapp
 
 import io.flutter.embedding.android.FlutterActivity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.annotation.NonNull
+
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
 
 class MainActivity: FlutterActivity() {
+    private val eventsChannel = "com.walletconnect.flutterdapp/events"
+    private val methodsChannel = "com.walletconnect.flutterdapp/methods"
+
+    private var initialLink: String? = null
+    private var linksReceiver: BroadcastReceiver? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val intent: Intent? = intent
+        initialLink = intent?.data?.toString()
+
+        EventChannel(flutterEngine?.dartExecutor?.binaryMessenger, eventsChannel).setStreamHandler(
+            object : EventChannel.StreamHandler {
+                override fun onListen(args: Any?, events: EventChannel.EventSink) {
+                    linksReceiver = createChangeReceiver(events)
+                }
+                override fun onCancel(args: Any?) {
+                    linksReceiver = null
+                }
+            }
+        )
+
+        MethodChannel(flutterEngine!!.dartExecutor.binaryMessenger, methodsChannel).setMethodCallHandler { call, result ->
+            if (call.method == "initialLink") {
+                if (initialLink != null) {
+                    result.success(initialLink)
+                }
+            }
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        if (intent.action === Intent.ACTION_VIEW) {
+            linksReceiver?.onReceive(this.applicationContext, intent)
+        }
+    }
+
+    fun createChangeReceiver(events: EventChannel.EventSink): BroadcastReceiver? {
+        return object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                val dataString = intent.dataString ?:
+                events.error("UNAVAILABLE", "Link unavailable", null)
+                events.success(dataString)
+            }
+        }
+    }
 }
diff --git a/example/dapp/ios/Runner/AppDelegate.swift b/example/dapp/ios/Runner/AppDelegate.swift
index 641708da..31be96ee 100644
--- a/example/dapp/ios/Runner/AppDelegate.swift
+++ b/example/dapp/ios/Runner/AppDelegate.swift
@@ -4,8 +4,8 @@ import Flutter
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
     
-    private static let EVENTS_CHANNEL = "com.walletconnect.flutterwallet/events"
-    private static let METHODS_CHANNEL = "com.walletconnect.flutterwallet/methods"
+    private static let EVENTS_CHANNEL = "com.walletconnect.flutterdapp/events"
+    private static let METHODS_CHANNEL = "com.walletconnect.flutterdapp/methods"
     
     private var eventsChannel: FlutterEventChannel?
     private var methodsChannel: FlutterMethodChannel?
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index c0c41fc1..bcd564f6 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -67,7 +67,6 @@ class _MyHomePageState extends State<MyHomePage> {
     return flavor.replaceAll('-production', '');
   }
 
-  // ignore: unused_element
   String _universalLink() {
     Uri link = Uri.parse('https://lab.web3modal.com/flutter_appkit');
     if (_flavor.isNotEmpty) {
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index c98e39cd..d5608d23 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:async';
 import 'dart:convert';
 
@@ -13,6 +15,7 @@ import 'package:walletconnect_flutter_v2_dapp/utils/crypto/chain_data.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/eip155.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/polkadot.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/crypto/solana.dart';
+import 'package:walletconnect_flutter_v2_dapp/utils/sample_wallets.dart';
 import 'package:walletconnect_flutter_v2_dapp/utils/string_constants.dart';
 import 'package:walletconnect_flutter_v2_dapp/widgets/chain_button.dart';
 import 'package:walletconnect_flutter_v2_dapp/imports.dart';
@@ -243,56 +246,89 @@ class ConnectPageState extends State<ConnectPage> {
           children: [
             const SizedBox(height: StyleConstants.linear8),
             const Text(
-              'Use custom connection:',
+              'Use custom connection with:',
               style: StyleConstants.buttonText,
             ),
-            const SizedBox(height: StyleConstants.linear8),
-            SizedBox(
-              width: double.infinity,
-              child: ElevatedButton(
-                style: _buttonStyle,
-                onPressed: _selectedChains.isEmpty
-                    ? null
-                    : () => _onConnect(
-                          showToast: (m) async {
-                            await showPlatformToast(
-                                child: Text(m), context: context);
-                          },
-                          closeModal: () {
-                            if (Navigator.canPop(context)) {
-                              Navigator.of(context).pop();
-                            }
-                          },
+            Column(
+              children: WCSampleWallets.getSampleWallets().map((wallet) {
+                return Column(
+                  children: [
+                    const SizedBox(height: StyleConstants.linear8),
+                    SizedBox(
+                      width: double.infinity,
+                      child: ElevatedButton(
+                        style: _buttonStyle,
+                        onPressed: _selectedChains.isEmpty
+                            ? null
+                            : () {
+                                _onConnect(
+                                  nativeLink: '${wallet['schema']}',
+                                  closeModal: () {
+                                    if (Navigator.canPop(context)) {
+                                      Navigator.of(context).pop();
+                                    }
+                                  },
+                                  showToast: (m) async {
+                                    showPlatformToast(
+                                      child: Text(m),
+                                      context: context,
+                                    );
+                                  },
+                                );
+                              },
+                        child: Text(
+                          '${wallet['name']}',
+                          style: StyleConstants.buttonText,
                         ),
-                child: const Text(
-                  StringConstants.connect,
-                  style: StyleConstants.buttonText,
-                ),
-              ),
+                      ),
+                    ),
+                  ],
+                );
+              }).toList(),
             ),
             const SizedBox(height: StyleConstants.linear8),
-            SizedBox(
-              width: double.infinity,
-              child: ElevatedButton(
-                style: _buttonStyle,
-                onPressed: _selectedChains.isEmpty
-                    ? null
-                    : () => _sessionAuthenticate(
-                          closeModal: () {
-                            if (Navigator.canPop(context)) {
-                              Navigator.of(context).pop();
-                            }
-                          },
-                          showToast: (message) {
-                            showPlatformToast(
-                                child: Text(message), context: context);
-                          },
+            const Divider(),
+            const Text(
+              'Use One-Click Auth with:',
+              style: StyleConstants.buttonText,
+            ),
+            Column(
+              children: WCSampleWallets.getSampleWallets().map((wallet) {
+                return Column(
+                  children: [
+                    const SizedBox(height: StyleConstants.linear8),
+                    SizedBox(
+                      width: double.infinity,
+                      child: ElevatedButton(
+                        style: _buttonStyle,
+                        onPressed: _selectedChains.isEmpty
+                            ? null
+                            : () {
+                                _sessionAuthenticate(
+                                  nativeLink: '${wallet['schema']}',
+                                  universalLink: '${wallet['universal']}',
+                                  closeModal: () {
+                                    if (Navigator.canPop(context)) {
+                                      Navigator.of(context).pop();
+                                    }
+                                  },
+                                  showToast: (message) {
+                                    showPlatformToast(
+                                      child: Text(message),
+                                      context: context,
+                                    );
+                                  },
+                                );
+                              },
+                        child: Text(
+                          '${wallet['name']}',
+                          style: StyleConstants.buttonText,
                         ),
-                child: const Text(
-                  'One-Click Auth',
-                  style: StyleConstants.buttonText,
-                ),
-              ),
+                      ),
+                    ),
+                  ],
+                );
+              }).toList(),
             ),
           ],
         ),
@@ -369,23 +405,10 @@ class ConnectPageState extends State<ConnectPage> {
     );
   }
 
-  // Future<void> _onConnectWeb() async {
-  //   // `Ethereum.isSupported` is the same as `ethereum != null`
-  //   if (ethereum != null) {
-  //     try {
-  //       // Prompt user to connect to the provider, i.e. confirm the connection modal
-  //       final accounts = await ethereum!.requestAccount();
-  //       // Get all accounts in node disposal
-  //       debugPrint('accounts ${accounts.join(', ')}');
-  //     } on EthereumUserRejected {
-  //       debugPrint('User rejected the modal');
-  //     }
-  //   }
-  // }
-
   Future<void> _onConnect({
-    Function(String message)? showToast,
+    required String nativeLink,
     VoidCallback? closeModal,
+    Function(String message)? showToast,
   }) async {
     debugPrint('[SampleDapp] Creating connection and session');
     // It is currently safer to send chains approvals on optionalNamespaces
@@ -397,7 +420,7 @@ class ConnectPageState extends State<ConnectPage> {
 
     try {
       final encodedUri = Uri.encodeComponent(connectResponse.uri.toString());
-      final uri = '$_testWalletScheme?uri=$encodedUri';
+      final uri = '$nativeLink?uri=$encodedUri';
       await WalletConnectUtils.openURL(uri);
     } catch (e) {
       _showQrCode(connectResponse.uri.toString());
@@ -410,6 +433,55 @@ class ConnectPageState extends State<ConnectPage> {
     closeModal?.call();
   }
 
+  void _sessionAuthenticate({
+    required String nativeLink,
+    required String universalLink,
+    VoidCallback? closeModal,
+    Function(String message)? showToast,
+  }) async {
+    final methods1 = requiredNamespaces['eip155']?.methods ?? [];
+    final methods2 = optionalNamespaces['eip155']?.methods ?? [];
+    final authResponse = await widget.web3App.authenticate(
+      params: SessionAuthRequestParams(
+        chains: _selectedChains.map((e) => e.chainId).toList(),
+        domain: Uri.parse(widget.web3App.metadata.url).authority,
+        nonce: AuthUtils.generateNonce(),
+        uri: widget.web3App.metadata.url,
+        statement: 'Welcome to example flutter app',
+        methods: <String>{...methods1, ...methods2}.toList(),
+      ),
+      walletUniversalLink: universalLink,
+    );
+
+    try {
+      debugPrint('[SampleDapp] authResponse.uri ${authResponse.uri}');
+      await WalletConnectUtils.openURL(authResponse.uri.toString());
+    } catch (e) {
+      _showQrCode(
+        authResponse.uri.toString(),
+        walletScheme: nativeLink,
+      );
+    }
+
+    try {
+      debugPrint('[SampleDapp] Awaiting 1-CA session');
+      final response = await authResponse.completer.future;
+
+      if (response.session != null) {
+        showToast?.call(
+          '${StringConstants.authSucceeded} and ${StringConstants.connectionEstablished}',
+        );
+      } else {
+        final error = response.error ?? response.jsonRpcError;
+        showToast?.call(error.toString());
+      }
+    } catch (e) {
+      debugPrint('[SampleDapp] 1-CA $e');
+      showToast?.call(StringConstants.connectionFailed);
+    }
+    closeModal?.call();
+  }
+
   Future<void> _showQrCode(String uri, {String walletScheme = ''}) async {
     // Show the QR code
     debugPrint('[SampleDapp] Showing QR Code: $uri');
@@ -459,134 +531,6 @@ class ConnectPageState extends State<ConnectPage> {
     );
   }
 
-  void _requestAuth(
-    SessionConnect? event, {
-    Function(String message)? showToast,
-  }) async {
-    final shouldAuth = await showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          insetPadding: const EdgeInsets.all(0.0),
-          contentPadding: const EdgeInsets.all(0.0),
-          backgroundColor: Colors.white,
-          title: const Text('Request Auth?'),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.pop(context, false),
-              child: const Text('Cancel'),
-            ),
-            TextButton(
-              onPressed: () {
-                Navigator.pop(context, true);
-              },
-              child: const Text('Yes!'),
-            ),
-          ],
-        );
-      },
-    );
-    if (shouldAuth != true) return;
-
-    try {
-      final pairingTopic = event?.session.pairingTopic;
-      // Send off an auth request now that the pairing/session is established
-      final authResponse = await widget.web3App.requestAuth(
-        pairingTopic: pairingTopic,
-        params: AuthRequestParams(
-          chainId: 'eip155:1',
-          domain: Uri.parse(widget.web3App.metadata.url).authority,
-          aud: widget.web3App.metadata.url,
-          statement: 'Welcome to example flutter app',
-        ),
-      );
-
-      widget.web3App.redirectToWallet(event?.session.peer.metadata);
-      debugPrint('[SampleDapp] Awaiting authentication response');
-      final response = await authResponse.completer.future;
-      if (response.result != null) {
-        showToast?.call(StringConstants.authSucceeded);
-      } else {
-        final error = response.error ?? response.jsonRpcError;
-        showToast?.call(error.toString());
-      }
-    } catch (e) {
-      debugPrint('[SampleDapp] auth $e');
-      showToast?.call(StringConstants.connectionFailed);
-    }
-  }
-
-  String? _testWalletLink() {
-    if (widget.web3App.metadata.redirect?.linkMode == true) {
-      return 'https://lab.web3modal.com/wallet';
-      // Uri link = Uri.parse('https://lab.web3modal.com/flutter_walletkit');
-      // if (_flavor.isNotEmpty) {
-      //   return link
-      //       .replace(path: '${link.path}_internal')
-      //       .replace(host: 'dev.${link.host}')
-      //       .toString();
-      // }
-      // return link.toString();
-    }
-    return null;
-  }
-
-  String get _testWalletScheme {
-    return 'walletapp://wc';
-    // return 'wcflutterwallet$_flavor://wc';
-  }
-
-  void _sessionAuthenticate({
-    VoidCallback? closeModal,
-    Function(String message)? showToast,
-  }) async {
-    final methods1 = requiredNamespaces['eip155']?.methods ?? [];
-    final methods2 = optionalNamespaces['eip155']?.methods ?? [];
-    final walletUniversalLink = _testWalletLink();
-    final authResponse = await widget.web3App.authenticate(
-      params: SessionAuthRequestParams(
-        chains: _selectedChains.map((e) => e.chainId).toList(),
-        domain: Uri.parse(widget.web3App.metadata.url).authority,
-        nonce: AuthUtils.generateNonce(),
-        uri: widget.web3App.metadata.url,
-        statement: 'Welcome to example flutter app',
-        methods: <String>{...methods1, ...methods2}.toList(),
-      ),
-      walletUniversalLink: walletUniversalLink,
-    );
-
-    try {
-      debugPrint('[SampleDapp] authResponse.uri ${authResponse.uri}');
-      await WalletConnectUtils.openURL(authResponse.uri.toString());
-    } catch (e) {
-      // final encodedUri = Uri.encodeComponent(uri);
-      // await WalletConnectUtils.openURL('$_testWalletScheme?uri=$encodedUri');
-      _showQrCode(
-        authResponse.uri.toString(),
-        walletScheme: _testWalletScheme,
-      );
-    }
-
-    try {
-      debugPrint('[SampleDapp] Awaiting 1-CA session');
-      final response = await authResponse.completer.future;
-
-      if (response.session != null) {
-        showToast?.call(
-          '${StringConstants.authSucceeded} and ${StringConstants.connectionEstablished}',
-        );
-      } else {
-        final error = response.error ?? response.jsonRpcError;
-        showToast?.call(error.toString());
-      }
-    } catch (e) {
-      debugPrint('[SampleDapp] 1-CA $e');
-      showToast?.call(StringConstants.connectionFailed);
-    }
-    closeModal?.call();
-  }
-
   void _onSessionConnect(SessionConnect? event) async {
     if (event == null) return;
 
@@ -596,19 +540,6 @@ class ConnectPageState extends State<ConnectPage> {
       _shouldDismissQrCode = false;
       Navigator.pop(context);
     }
-
-    _requestAuth(
-      event,
-      showToast: (message) {
-        showPlatformToast(child: Text(message), context: context);
-      },
-    );
-  }
-
-  // ignore: unused_element
-  String get _flavor {
-    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
-    return flavor.replaceAll('-production', '');
   }
 
   ButtonStyle get _buttonStyle => ButtonStyle(
diff --git a/example/dapp/lib/utils/deep_link_handler.dart b/example/dapp/lib/utils/deep_link_handler.dart
index 8c3dc867..80d1a64c 100644
--- a/example/dapp/lib/utils/deep_link_handler.dart
+++ b/example/dapp/lib/utils/deep_link_handler.dart
@@ -4,20 +4,24 @@ import 'package:walletconnect_flutter_v2_dapp/imports.dart';
 
 class DeepLinkHandler {
   static const _methodChannel = MethodChannel(
-    'com.walletconnect.flutterwallet/methods',
+    'com.walletconnect.flutterdapp/methods',
   );
   static const _eventChannel = EventChannel(
-    'com.walletconnect.flutterwallet/events',
+    'com.walletconnect.flutterdapp/events',
   );
   static final waiting = ValueNotifier<bool>(false);
   static late IWeb3App _web3app;
 
   static void initListener() {
     if (kIsWeb) return;
-    _eventChannel.receiveBroadcastStream().listen(
-          _onLink,
-          onError: _onError,
-        );
+    try {
+      _eventChannel.receiveBroadcastStream().listen(
+            _onLink,
+            onError: _onError,
+          );
+    } catch (e) {
+      debugPrint('[SampleWallet] [DeepLinkHandler] checkInitialLink $e');
+    }
   }
 
   static void init(IWeb3App web3app) {
diff --git a/example/dapp/lib/widgets/method_dialog.dart b/example/dapp/lib/widgets/method_dialog.dart
index 4b402cf9..10791f9b 100644
--- a/example/dapp/lib/widgets/method_dialog.dart
+++ b/example/dapp/lib/widgets/method_dialog.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:convert';
 
 import 'package:fl_toast/fl_toast.dart';
diff --git a/example/dapp/pubspec.yaml b/example/dapp/pubspec.yaml
index 5c60bea9..d788f4ab 100644
--- a/example/dapp/pubspec.yaml
+++ b/example/dapp/pubspec.yaml
@@ -16,8 +16,6 @@ dependencies:
   qr_flutter: ^4.0.0
   json_annotation: ^4.8.1
   fl_toast: ^3.1.0
-  url_launcher: ^6.2.2
-  # intl: ^0.19.0
   package_info_plus: ^7.0.0
   walletconnect_modal_flutter: ^2.1.20
 
diff --git a/example/wallet/ios/Runner/AppDelegate.swift b/example/wallet/ios/Runner/AppDelegate.swift
index 760ab1e9..641708da 100644
--- a/example/wallet/ios/Runner/AppDelegate.swift
+++ b/example/wallet/ios/Runner/AppDelegate.swift
@@ -25,8 +25,9 @@ import Flutter
             if (call.method == "initialLink") {
                 if let link = self?.initialLink {
                     self?.initialLink = nil
-                    let _ = self?.linkStreamHandler.handleLink(link)
-                    return
+                    result(link)
+                } else {
+                    result("")
                 }
             }
         })
diff --git a/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart b/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart
index 75386db0..1402b4ef 100644
--- a/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart
+++ b/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart
@@ -1,4 +1,6 @@
 // bottom_sheet_listener.dart
+// ignore_for_file: use_build_context_synchronously
+
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 7e3c6796..5a6b4555 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -59,7 +59,7 @@ class Web3WalletService extends IWeb3WalletService {
         logLevel: LogLevel.error,
       ),
       metadata: PairingMetadata(
-        name: 'Sample Wallet Flutter',
+        name: 'Flutter Wallet Sample',
         description: 'WalletConnect\'s sample wallet with Flutter',
         url: 'https://walletconnect.com/',
         icons: [
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index ff4b2c47..8898a883 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:math';
 import 'dart:ui';
 
@@ -37,7 +39,6 @@ class _SettingsPageState extends State<SettingsPage> {
                   onCreateAddress: () async {
                     await keysService.createAddressFromSeed();
                     await keysService.loadKeys();
-                    // ignore: use_build_context_synchronously
                     Navigator.of(context).pop();
                     setState(() {});
                   },
@@ -87,7 +88,6 @@ class _SettingsPageState extends State<SettingsPage> {
                       );
                       await keysService.loadKeys();
                       await showDialog(
-                        // ignore: use_build_context_synchronously
                         context: context,
                         builder: (BuildContext context) {
                           return const AlertDialog(
@@ -102,7 +102,6 @@ class _SettingsPageState extends State<SettingsPage> {
                     await keysService.loadDefaultWallet();
                     await keysService.loadKeys();
                     await showDialog(
-                      // ignore: use_build_context_synchronously
                       context: context,
                       builder: (BuildContext context) {
                         return const AlertDialog(
diff --git a/example/wallet/packages/qr-bar-code-scanner-dialog/android/build.gradle b/example/wallet/packages/qr-bar-code-scanner-dialog/android/build.gradle
index c8261124..3d5ba6d7 100644
--- a/example/wallet/packages/qr-bar-code-scanner-dialog/android/build.gradle
+++ b/example/wallet/packages/qr-bar-code-scanner-dialog/android/build.gradle
@@ -42,6 +42,6 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 20
     }
 }
diff --git a/example/wallet/pubspec.yaml b/example/wallet/pubspec.yaml
index c263ecf9..e3238d70 100644
--- a/example/wallet/pubspec.yaml
+++ b/example/wallet/pubspec.yaml
@@ -22,7 +22,6 @@ dependencies:
   get_it_mixin: ^4.0.0
   package_info_plus: ^7.0.0
   convert: ^3.0.1
-  # url_launcher: ^6.2.2
   
   # CHECK WEB SUPPORT
   kadena_dart_sdk: ^2.3.2
diff --git a/lib/apis/core/pairing/pairing.dart b/lib/apis/core/pairing/pairing.dart
index ca226f60..79a3aa43 100644
--- a/lib/apis/core/pairing/pairing.dart
+++ b/lib/apis/core/pairing/pairing.dart
@@ -435,16 +435,16 @@ class Pairing implements IPairing {
 
     if ((appLink ?? '').isNotEmpty) {
       // during wc_sessionAuthenticate we don't need to openURL as it will be done by the host dapp
+      core.logger.t(
+        'pairing sendRequest LinkMode, '
+        'id: $id topic: $topic, method: $method, params: $params, ttl: $ttl',
+      );
       if (openUrl) {
         final redirectURL = WalletConnectUtils.getLinkModeURL(
           appLink!,
           topic,
           message,
         );
-        core.logger.t(
-          'pairing sendRequest LinkMode, '
-          'id: $id topic: $topic, method: $method, params: $params, ttl: $ttl',
-        );
         await WalletConnectUtils.openURL(redirectURL);
       }
     } else {
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index bc20b268..0b38c88a 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -505,7 +505,7 @@ class SignEngine implements ISignEngine {
   }
 
   @override
-  Future request({
+  Future<dynamic> request({
     required String topic,
     required String chainId,
     required SessionRequestParams request,

From e1d271ef82ce065394808ec498f241af0c2ee5b1 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 23 Aug 2024 20:35:12 +0200
Subject: [PATCH 06/22] Android side

---
 example/dapp/lib/utils/sample_wallets.dart | 70 ++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 example/dapp/lib/utils/sample_wallets.dart

diff --git a/example/dapp/lib/utils/sample_wallets.dart b/example/dapp/lib/utils/sample_wallets.dart
new file mode 100644
index 00000000..fd866f12
--- /dev/null
+++ b/example/dapp/lib/utils/sample_wallets.dart
@@ -0,0 +1,70 @@
+import 'dart:io';
+
+class WCSampleWallets {
+  static final List<Map<String, dynamic>> sampleWallets = [
+    {
+      'name': 'Swift Wallet',
+      'platform': ['ios'],
+      'id': '123456789012345678901234567890',
+      'schema': 'walletapp://',
+      'bundleId': 'com.walletconnect.sample.wallet',
+      'universal': 'https://lab.web3modal.com/wallet',
+    },
+    {
+      'name': 'Flutter Wallet',
+      'platform': ['ios', 'android'],
+      'id': '123456789012345678901234567891',
+      'schema': 'wcflutterwallet://',
+      'bundleId': 'com.walletconnect.flutterwallet',
+      'universal': 'https://lab.web3modal.com/flutter_walletkit',
+    },
+    {
+      'name': 'Flutter Wallet (internal)',
+      'platform': ['ios', 'android'],
+      'id': '123456789012345678901234567895',
+      'schema': 'wcflutterwallet-internal://',
+      'bundleId': 'com.walletconnect.flutterwallet.internal',
+      'universal': 'https://dev.lab.web3modal.com/flutter_walletkit_internal',
+    },
+    {
+      'name': 'RN Wallet',
+      'platform': ['ios', 'android'],
+      'id': '123456789012345678901234567892',
+      'schema': 'rn-web3wallet://',
+      'bundleId': 'com.walletconnect.web3wallet.rnsample',
+      'universal': 'https://lab.web3modal.com/rn_walletkit',
+    },
+    {
+      'name': 'RN Wallet (internal)',
+      'platform': ['ios', 'android'],
+      'id': '1234567890123456789012345678922',
+      'schema': 'rn-web3wallet://',
+      'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
+      'universal': 'https://lab.web3modal.com/rn_walletkit',
+    },
+    {
+      'name': 'Kotlin Wallet',
+      'platform': ['android'],
+      'id': '123456789012345678901234567893',
+      'schema': 'kotlin-web3wallet://',
+      'bundleId': 'com.walletconnect.sample.wallet',
+      'universal':
+          'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release',
+    },
+    {
+      'name': 'Kotlin Wallet (Internal)',
+      'platform': ['android'],
+      'id': '123456789012345678901234567894',
+      'schema': 'kotlin-web3wallet://',
+      'bundleId': 'com.walletconnect.sample.wallet.internal',
+      'universal':
+          'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
+    },
+  ];
+
+  static List<Map<String, dynamic>> getSampleWallets() {
+    return sampleWallets.where((e) {
+      return (e['platform'] as List<String>).contains(Platform.operatingSystem);
+    }).toList();
+  }
+}

From ac5b48c2fb1c21be19e90bb24499e6cad2a229cc Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 26 Aug 2024 14:34:18 +0200
Subject: [PATCH 07/22] final bug fixes

---
 example/dapp/lib/pages/connect_page.dart      | 135 +++++++++---------
 example/dapp/lib/widgets/session_widget.dart  |   5 +-
 .../android/app/src/main/AndroidManifest.xml  |  40 +++++-
 .../chain_services/cosmos_service.dart        |  34 +++--
 .../chain_services/evm_service.dart           | 132 +++--------------
 .../chain_services/kadena_service.dart        |  36 +++--
 .../chain_services/polkadot_service.dart      |  34 +++--
 .../chain_services/solana_service.dart        |  34 +++--
 .../dependencies/key_service/key_service.dart |   5 +-
 .../lib/dependencies/web3wallet_service.dart  |  99 ++++++-------
 example/wallet/lib/pages/app_detail_page.dart |   5 +-
 example/wallet/lib/utils/methods_utils.dart   |  46 +++---
 lib/apis/sign_api/i_sign_client.dart          |  10 +-
 lib/apis/sign_api/i_sign_engine_app.dart      |   5 +-
 lib/apis/sign_api/i_sign_engine_wallet.dart   |   5 +-
 lib/apis/sign_api/sign_client.dart            |  20 ++-
 lib/apis/sign_api/sign_engine.dart            |  33 +++--
 lib/apis/web3app/web3app.dart                 |  10 +-
 lib/apis/web3wallet/web3wallet.dart           |  10 +-
 .../utils/sign_client_test_wrapper.dart       |  20 ++-
 20 files changed, 384 insertions(+), 334 deletions(-)

diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index d5608d23..d2e8d617 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -246,87 +246,83 @@ class ConnectPageState extends State<ConnectPage> {
           children: [
             const SizedBox(height: StyleConstants.linear8),
             const Text(
-              'Use custom connection with:',
+              'Connect Session Propose:',
               style: StyleConstants.buttonText,
             ),
-            Column(
+            const SizedBox(height: StyleConstants.linear8),
+            Wrap(
+              spacing: 8.0,
+              runSpacing: 8.0,
               children: WCSampleWallets.getSampleWallets().map((wallet) {
-                return Column(
-                  children: [
-                    const SizedBox(height: StyleConstants.linear8),
-                    SizedBox(
-                      width: double.infinity,
-                      child: ElevatedButton(
-                        style: _buttonStyle,
-                        onPressed: _selectedChains.isEmpty
-                            ? null
-                            : () {
-                                _onConnect(
-                                  nativeLink: '${wallet['schema']}',
-                                  closeModal: () {
-                                    if (Navigator.canPop(context)) {
-                                      Navigator.of(context).pop();
-                                    }
-                                  },
-                                  showToast: (m) async {
-                                    showPlatformToast(
-                                      child: Text(m),
-                                      context: context,
-                                    );
-                                  },
+                return SizedBox(
+                  width: (MediaQuery.of(context).size.width / 2) - 16,
+                  child: ElevatedButton(
+                    style: _buttonStyle,
+                    onPressed: _selectedChains.isEmpty
+                        ? null
+                        : () {
+                            _onConnect(
+                              nativeLink: '${wallet['schema']}',
+                              closeModal: () {
+                                if (Navigator.canPop(context)) {
+                                  Navigator.of(context).pop();
+                                }
+                              },
+                              showToast: (m) async {
+                                showPlatformToast(
+                                  child: Text(m),
+                                  context: context,
                                 );
                               },
-                        child: Text(
-                          '${wallet['name']}',
-                          style: StyleConstants.buttonText,
-                        ),
-                      ),
+                            );
+                          },
+                    child: Text(
+                      '${wallet['name']}',
+                      style: StyleConstants.buttonText,
                     ),
-                  ],
+                  ),
                 );
               }).toList(),
             ),
             const SizedBox(height: StyleConstants.linear8),
             const Divider(),
             const Text(
-              'Use One-Click Auth with:',
+              '1-Click Auth with LinkMode:',
               style: StyleConstants.buttonText,
             ),
-            Column(
+            const SizedBox(height: StyleConstants.linear8),
+            Wrap(
+              spacing: 8.0,
+              runSpacing: 8.0,
               children: WCSampleWallets.getSampleWallets().map((wallet) {
-                return Column(
-                  children: [
-                    const SizedBox(height: StyleConstants.linear8),
-                    SizedBox(
-                      width: double.infinity,
-                      child: ElevatedButton(
-                        style: _buttonStyle,
-                        onPressed: _selectedChains.isEmpty
-                            ? null
-                            : () {
-                                _sessionAuthenticate(
-                                  nativeLink: '${wallet['schema']}',
-                                  universalLink: '${wallet['universal']}',
-                                  closeModal: () {
-                                    if (Navigator.canPop(context)) {
-                                      Navigator.of(context).pop();
-                                    }
-                                  },
-                                  showToast: (message) {
-                                    showPlatformToast(
-                                      child: Text(message),
-                                      context: context,
-                                    );
-                                  },
+                return SizedBox(
+                  width: (MediaQuery.of(context).size.width / 2) - 16,
+                  child: ElevatedButton(
+                    style: _buttonStyle,
+                    onPressed: _selectedChains.isEmpty
+                        ? null
+                        : () {
+                            _sessionAuthenticate(
+                              nativeLink: '${wallet['schema']}',
+                              universalLink: '${wallet['universal']}',
+                              closeModal: () {
+                                if (Navigator.canPop(context)) {
+                                  Navigator.of(context).pop();
+                                }
+                              },
+                              showToast: (message) {
+                                showPlatformToast(
+                                  child: Text(message),
+                                  context: context,
                                 );
                               },
-                        child: Text(
-                          '${wallet['name']}',
-                          style: StyleConstants.buttonText,
-                        ),
-                      ),
+                            );
+                          },
+                    child: Text(
+                      '${wallet['name']}',
+                      style: StyleConstants.buttonText,
                     ),
-                  ],
+                  ),
                 );
               }).toList(),
             ),
@@ -410,7 +406,7 @@ class ConnectPageState extends State<ConnectPage> {
     VoidCallback? closeModal,
     Function(String message)? showToast,
   }) async {
-    debugPrint('[SampleDapp] Creating connection and session');
+    debugPrint('[SampleDapp] Creating connection with $nativeLink');
     // It is currently safer to send chains approvals on optionalNamespaces
     // but depending on Wallet implementation you may need to send some (for innstance eip155:1) as required
     final connectResponse = await widget.web3App.connect(
@@ -427,9 +423,12 @@ class ConnectPageState extends State<ConnectPage> {
     }
 
     debugPrint('[SampleDapp] Awaiting session proposal settlement');
-    final _ = await connectResponse.session.future;
-
-    showToast?.call(StringConstants.connectionEstablished);
+    try {
+      await connectResponse.session.future;
+      showToast?.call(StringConstants.connectionEstablished);
+    } on JsonRpcError catch (e) {
+      showToast?.call(e.message.toString());
+    }
     closeModal?.call();
   }
 
@@ -439,6 +438,8 @@ class ConnectPageState extends State<ConnectPage> {
     VoidCallback? closeModal,
     Function(String message)? showToast,
   }) async {
+    debugPrint(
+        '[SampleDapp] Creating authenticate with $nativeLink, $universalLink');
     final methods1 = requiredNamespaces['eip155']?.methods ?? [];
     final methods2 = optionalNamespaces['eip155']?.methods ?? [];
     final authResponse = await widget.web3App.authenticate(
diff --git a/example/dapp/lib/widgets/session_widget.dart b/example/dapp/lib/widgets/session_widget.dart
index 7c9888fb..520e308c 100644
--- a/example/dapp/lib/widgets/session_widget.dart
+++ b/example/dapp/lib/widgets/session_widget.dart
@@ -264,7 +264,10 @@ class SessionWidgetState extends State<SessionWidget> {
 
   void _launchWallet() {
     if (kIsWeb) return;
-    widget.web3App.redirectToWallet(widget.session.peer.metadata);
+    widget.web3App.redirectToWallet(
+      topic: widget.session.topic,
+      redirect: widget.session.peer.metadata.redirect,
+    );
   }
 
   List<Widget> _buildSepoliaButtons(String address, String chainId) {
diff --git a/example/wallet/android/app/src/main/AndroidManifest.xml b/example/wallet/android/app/src/main/AndroidManifest.xml
index 8171d35a..0430b51c 100644
--- a/example/wallet/android/app/src/main/AndroidManifest.xml
+++ b/example/wallet/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
-   <application
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application
         android:label="${applicationLabel}"
         android:name="${applicationName}"
         android:icon="${appIcon}">
@@ -18,32 +19,57 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <!-- LEGACY -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="wc" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="wcflutterwallet" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="wcflutterwallet-internal" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="lab.web3modal.com" />
+                <data android:pathPattern="/flutter_walletkit" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="dev.lab.web3modal.com" />
+                <data android:pathPattern="/flutter_walletkit_internal" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/example/wallet/lib/dependencies/chain_services/cosmos_service.dart b/example/wallet/lib/dependencies/chain_services/cosmos_service.dart
index 6a3ec40a..cf9a7712 100644
--- a/example/wallet/lib/dependencies/chain_services/cosmos_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/cosmos_service.dart
@@ -36,12 +36,8 @@ class CosmosService {
         message: 'Cosmos support not implemented',
       ),
     );
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> cosmosSignAmino(String topic, dynamic parameters) async {
@@ -55,11 +51,29 @@ class CosmosService {
         message: 'Cosmos support not implemented',
       ),
     );
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
+  }
+
+  void _handleResponseForTopic(String topic, JsonRpcResponse response) async {
+    final session = _web3Wallet.sessions.get(topic);
+
+    try {
+      await _web3Wallet.respondSessionRequest(
+        topic: topic,
+        response: response,
+      );
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        response.error?.message,
+      );
+    } on WalletConnectError catch (error) {
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
+      );
+    }
   }
 }
diff --git a/example/wallet/lib/dependencies/chain_services/evm_service.dart b/example/wallet/lib/dependencies/chain_services/evm_service.dart
index f9ffce95..7b20c068 100644
--- a/example/wallet/lib/dependencies/chain_services/evm_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/evm_service.dart
@@ -136,19 +136,7 @@ class EVMService {
       );
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> ethSign(String topic, dynamic parameters) async {
@@ -193,19 +181,7 @@ class EVMService {
       );
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> ethSignTypedData(String topic, dynamic parameters) async {
@@ -245,19 +221,7 @@ class EVMService {
       );
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> ethSignTypedDataV4(String topic, dynamic parameters) async {
@@ -297,19 +261,7 @@ class EVMService {
       );
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> ethSignTransaction(String topic, dynamic parameters) async {
@@ -365,19 +317,7 @@ class EVMService {
       response = response.copyWith(error: transaction as JsonRpcError);
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> ethSendTransaction(String topic, dynamic parameters) async {
@@ -431,19 +371,7 @@ class EVMService {
       response = response.copyWith(error: transaction as JsonRpcError);
     }
 
-    try {
-      await _web3Wallet.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-      MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
-    } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
-      );
-    }
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> switchChain(String topic, dynamic parameters) async {
@@ -475,17 +403,27 @@ class EVMService {
       );
     }
 
+    _handleResponseForTopic(topic, response);
+  }
+
+  void _handleResponseForTopic(String topic, JsonRpcResponse response) async {
+    final session = _web3Wallet.sessions.get(topic);
+
     try {
       await _web3Wallet.respondSessionRequest(
         topic: topic,
         response: response,
       );
-      MethodsUtils.goBackToDapp(topic, true);
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        response.error?.message,
+      );
     } on WalletConnectError catch (error) {
-      MethodsUtils.goBackModal(
-        title: 'Error',
-        message: error.message,
-        success: false,
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
       );
     }
   }
@@ -535,33 +473,7 @@ class EVMService {
 
     const encoder = JsonEncoder.withIndent('  ');
     final trx = encoder.convert(tJson);
-    // final WCBottomSheetResult rs = (await _bottomSheetService.queueBottomSheet(
-    //       widget: WCRequestWidget(
-    //         // TODO
-    //         child: WCConnectionWidget(
-    //           title: title ?? 'Approve Transaction',
-    //           info: [
-    //             WCConnectionModel(
-    //               title: 'Method: $method\n'
-    //                   'Chain ID: $chainId\n\n'
-    //                   'Transaction:',
-    //               elements: [
-    //                 trx,
-    //               ],
-    //             ),
-    //             WCConnectionModel(
-    //               title: 'Gas price',
-    //               elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],
-    //             ),
-    //           ],
-    //         ),
-    //       ),
-    //     )) ??
-    //     WCBottomSheetResult.reject;
-
-    // if (rs != WCBottomSheetResult.reject) {
-    //   return transaction;
-    // }
+
     if (await MethodsUtils.requestApproval(
       trx,
       title: title,
diff --git a/example/wallet/lib/dependencies/chain_services/kadena_service.dart b/example/wallet/lib/dependencies/chain_services/kadena_service.dart
index d5ca9262..d750a959 100644
--- a/example/wallet/lib/dependencies/chain_services/kadena_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/kadena_service.dart
@@ -95,12 +95,7 @@ class KadenaService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
-
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> kadenaSignV1(String topic, dynamic parameters) async {
@@ -168,7 +163,7 @@ class KadenaService {
       response: response,
     );
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> kadenaQuicksignV1(String topic, dynamic parameters) async {
@@ -250,12 +245,29 @@ class KadenaService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
+    _handleResponseForTopic(topic, response);
+  }
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+  void _handleResponseForTopic(String topic, JsonRpcResponse response) async {
+    final session = _web3Wallet.sessions.get(topic);
+
+    try {
+      await _web3Wallet.respondSessionRequest(
+        topic: topic,
+        response: response,
+      );
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        response.error?.message,
+      );
+    } on WalletConnectError catch (error) {
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
+      );
+    }
   }
 
   void _onSessionRequest(SessionRequestEvent? args) async {
diff --git a/example/wallet/lib/dependencies/chain_services/polkadot_service.dart b/example/wallet/lib/dependencies/chain_services/polkadot_service.dart
index 2188f80e..acc2b421 100644
--- a/example/wallet/lib/dependencies/chain_services/polkadot_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/polkadot_service.dart
@@ -96,12 +96,7 @@ class PolkadotService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
-
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> polkadotSignTransaction(String topic, dynamic parameters) async {
@@ -164,12 +159,29 @@ class PolkadotService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
+    _handleResponseForTopic(topic, response);
+  }
+
+  void _handleResponseForTopic(String topic, JsonRpcResponse response) async {
+    final session = _web3Wallet.sessions.get(topic);
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    try {
+      await _web3Wallet.respondSessionRequest(
+        topic: topic,
+        response: response,
+      );
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        response.error?.message,
+      );
+    } on WalletConnectError catch (error) {
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
+      );
+    }
   }
 
   void _onSessionRequest(SessionRequestEvent? args) async {
diff --git a/example/wallet/lib/dependencies/chain_services/solana_service.dart b/example/wallet/lib/dependencies/chain_services/solana_service.dart
index 1f306611..a8eb461f 100644
--- a/example/wallet/lib/dependencies/chain_services/solana_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/solana_service.dart
@@ -81,12 +81,7 @@ class SolanaService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
-
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    _handleResponseForTopic(topic, response);
   }
 
   Future<void> solanaSignTransaction(String topic, dynamic parameters) async {
@@ -152,12 +147,29 @@ class SolanaService {
       );
     }
 
-    await _web3Wallet.respondSessionRequest(
-      topic: topic,
-      response: response,
-    );
+    _handleResponseForTopic(topic, response);
+  }
+
+  void _handleResponseForTopic(String topic, JsonRpcResponse response) async {
+    final session = _web3Wallet.sessions.get(topic);
 
-    MethodsUtils.goBackToDapp(topic, response.result ?? response.error);
+    try {
+      await _web3Wallet.respondSessionRequest(
+        topic: topic,
+        response: response,
+      );
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        response.error?.message,
+      );
+    } on WalletConnectError catch (error) {
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
+      );
+    }
   }
 }
 
diff --git a/example/wallet/lib/dependencies/key_service/key_service.dart b/example/wallet/lib/dependencies/key_service/key_service.dart
index e4412238..876d5a0a 100644
--- a/example/wallet/lib/dependencies/key_service/key_service.dart
+++ b/example/wallet/lib/dependencies/key_service/key_service.dart
@@ -27,10 +27,7 @@ class KeyService extends IKeyService {
       //
       final extraKeys = await _extraChainKeys();
       _keys.addAll(extraKeys);
-    } catch (e, s) {
-      debugPrint('[$runtimeType] loadKeys() error: $e');
-      debugPrint(s.toString());
-    }
+    } catch (_) {}
 
     debugPrint('[$runtimeType] _keys $_keys');
     return _keys;
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 5a6b4555..8f488b85 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -196,12 +196,13 @@ class Web3WalletService extends IWeb3WalletService {
   void _onSessionProposal(SessionProposalEvent? args) async {
     debugPrint('[SampleWallet] _onSessionProposal ${jsonEncode(args?.params)}');
     if (args != null) {
+      final proposer = args.params.proposer;
       final result = (await _bottomSheetHandler.queueBottomSheet(
             widget: WCRequestWidget(
               child: WCConnectionRequestWidget(
                 proposalData: args.params,
                 verifyContext: args.verifyContext,
-                requester: args.params.proposer,
+                requester: proposer,
               ),
             ),
           )) ??
@@ -211,19 +212,22 @@ class Web3WalletService extends IWeb3WalletService {
         // generatedNamespaces is constructed based on registered methods handlers
         // so if you want to handle requests using onSessionRequest event then you would need to manually add that method in the approved namespaces
         try {
-          final response = await _web3Wallet!.approveSession(
+          final session = await _web3Wallet!.approveSession(
             id: args.id,
             namespaces: NamespaceUtils.regenerateNamespacesWithChains(
               args.params.generatedNamespaces!,
             ),
             sessionProperties: args.params.sessionProperties,
           );
-          MethodsUtils.goBackToDapp(response.topic, 'success');
+          MethodsUtils.handleRedirect(
+            session.topic,
+            session.session!.peer.metadata.redirect,
+          );
         } on WalletConnectError catch (error) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: error.message,
-            success: false,
+          MethodsUtils.handleRedirect(
+            '',
+            proposer.metadata.redirect,
+            error.message,
           );
         }
       } else {
@@ -232,13 +236,11 @@ class Web3WalletService extends IWeb3WalletService {
         await _web3Wallet!.core.pairing.disconnect(
           topic: args.params.pairingTopic,
         );
-        MethodsUtils.openApp(args.params.proposer.metadata, onFail: ([error]) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: 'User rejected',
-            success: false,
-          );
-        });
+        MethodsUtils.handleRedirect(
+          '',
+          proposer.metadata.redirect,
+          error.message,
+        );
       }
     }
   }
@@ -266,7 +268,10 @@ class Web3WalletService extends IWeb3WalletService {
     if (args != null) {
       final session = jsonEncode(args.session.toJson());
       debugPrint('[SampleWallet] _onSessionConnect $session');
-      MethodsUtils.goBackToDapp(args.session.topic, 'success');
+      // MethodsUtils.handleRedirect(
+      //   args.session.topic,
+      //   args.session.peer.metadata.redirect,
+      // );
     }
   }
 
@@ -349,30 +354,32 @@ class Web3WalletService extends IWeb3WalletService {
         }
         //
         try {
-          final response = await _web3Wallet!.approveSessionAuthenticate(
+          final session = await _web3Wallet!.approveSessionAuthenticate(
             id: args.id,
             auths: cacaos,
           );
-          MethodsUtils.goBackToDapp(response.session!.topic, 'success');
+          MethodsUtils.handleRedirect(
+            session.topic,
+            session.session?.peer.metadata.redirect,
+          );
         } on WalletConnectError catch (error) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: error.message,
-            success: false,
+          MethodsUtils.handleRedirect(
+            args.topic,
+            args.requester.metadata.redirect,
+            error.message,
           );
         }
       } else {
+        final error = Errors.getSdkError(Errors.USER_REJECTED_AUTH);
         await _web3Wallet!.rejectSessionAuthenticate(
           id: args.id,
-          reason: Errors.getSdkError(Errors.USER_REJECTED_AUTH),
+          reason: error,
+        );
+        MethodsUtils.handleRedirect(
+          args.topic,
+          args.requester.metadata.redirect,
+          error.message,
         );
-        MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: 'User rejected',
-            success: false,
-          );
-        });
       }
     }
   }
@@ -420,33 +427,29 @@ class Web3WalletService extends IWeb3WalletService {
               s: hexSignature,
             ),
           );
-          MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
-            MethodsUtils.goBackModal(
-              title: 'Success',
-              message: 'You can go back to ${args.requester.metadata.name}',
-              success: true,
-            );
-          });
+          MethodsUtils.handleRedirect(
+            args.topic,
+            args.requester.metadata.redirect,
+          );
         } on WalletConnectError catch (error) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: error.message,
-            success: false,
+          MethodsUtils.handleRedirect(
+            args.topic,
+            args.requester.metadata.redirect,
+            error.message,
           );
         }
       } else {
+        final error = Errors.getSdkError(Errors.USER_REJECTED_AUTH);
         await _web3Wallet!.respondAuthRequest(
           id: args.id,
           iss: iss,
-          error: Errors.getSdkError(Errors.USER_REJECTED_AUTH),
+          error: error,
+        );
+        MethodsUtils.handleRedirect(
+          args.topic,
+          args.requester.metadata.redirect,
+          error.message,
         );
-        MethodsUtils.openApp(args.requester.metadata, onFail: ([error]) {
-          MethodsUtils.goBackModal(
-            title: 'Error',
-            message: 'User rejected',
-            success: false,
-          );
-        });
       }
     }
   }
diff --git a/example/wallet/lib/pages/app_detail_page.dart b/example/wallet/lib/pages/app_detail_page.dart
index 969fe1e4..02194dc7 100644
--- a/example/wallet/lib/pages/app_detail_page.dart
+++ b/example/wallet/lib/pages/app_detail_page.dart
@@ -116,7 +116,10 @@ class AppDetailPageState extends State<AppDetailPage> {
                 Icons.open_in_new_rounded,
               ),
               onPressed: () {
-                MethodsUtils.openApp(metadata);
+                MethodsUtils.openApp(
+                  sessions.first.topic,
+                  sessions.first.peer.metadata.redirect,
+                );
               },
             ),
           )
diff --git a/example/wallet/lib/utils/methods_utils.dart b/example/wallet/lib/utils/methods_utils.dart
index e66a0c0a..94159108 100644
--- a/example/wallet/lib/utils/methods_utils.dart
+++ b/example/wallet/lib/utils/methods_utils.dart
@@ -12,30 +12,6 @@ import 'package:walletconnect_flutter_v2_wallet/widgets/wc_request_widget.dart/w
 class MethodsUtils {
   static final web3Wallet = GetIt.I<IWeb3WalletService>().web3wallet;
 
-  static void goBackToDapp(String topic, dynamic result) {
-    try {
-      if (result is String) {
-        final session = web3Wallet.sessions.get(topic);
-        openApp(session?.peer.metadata, onFail: ([error]) {
-          debugPrint('[SampleWallet] MethodsUtils: goBackToDapp $error');
-          goBackModal(
-            title: 'Success',
-            message: 'You can go back to ${session?.peer.metadata.name}',
-            success: true,
-          );
-        });
-      } else {
-        goBackModal(
-          title: 'Error',
-          message: result.toString(),
-          success: false,
-        );
-      }
-    } catch (e) {
-      debugPrint('[SampleWallet] MethodsUtils: goBackToDapp ${e.toString()}');
-    }
-  }
-
   static Future<bool> requestApproval(
     String text, {
     String? title,
@@ -71,15 +47,31 @@ class MethodsUtils {
     return rs != WCBottomSheetResult.reject;
   }
 
+  static void handleRedirect(
+    String topic,
+    Redirect? redirect, [
+    String? error,
+  ]) {
+    debugPrint(
+        '[SampleWallet] handleRedirect topic: $topic, redirect: $redirect, error: $error');
+    openApp(topic, redirect, onFail: (e) {
+      goBackModal(title: 'Error', message: e!.message, success: false);
+    });
+  }
+
   static void openApp(
-    PairingMetadata? metadata, {
+    String topic,
+    Redirect? redirect, {
     int delay = 100,
-    Function([WalletConnectError? error])? onFail,
+    Function(WalletConnectError? error)? onFail,
   }) async {
     await Future.delayed(Duration(milliseconds: delay));
     DeepLinkHandler.waiting.value = false;
     try {
-      await web3Wallet.redirectToDapp(metadata);
+      await web3Wallet.redirectToDapp(
+        topic: topic,
+        redirect: redirect,
+      );
     } on WalletConnectError catch (e) {
       onFail?.call(e);
     }
diff --git a/lib/apis/sign_api/i_sign_client.dart b/lib/apis/sign_api/i_sign_client.dart
index 45d357c4..82a38409 100644
--- a/lib/apis/sign_api/i_sign_client.dart
+++ b/lib/apis/sign_api/i_sign_client.dart
@@ -209,7 +209,13 @@ abstract class ISignClient {
 
   Future<void> dispatchEnvelope(String url);
 
-  Future<bool> redirectToDapp(PairingMetadata? metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  });
 
-  Future<bool> redirectToWallet(PairingMetadata? metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  });
 }
diff --git a/lib/apis/sign_api/i_sign_engine_app.dart b/lib/apis/sign_api/i_sign_engine_app.dart
index d81a9d52..17444241 100644
--- a/lib/apis/sign_api/i_sign_engine_app.dart
+++ b/lib/apis/sign_api/i_sign_engine_app.dart
@@ -64,5 +64,8 @@ abstract class ISignEngineApp extends ISignEngineCommon {
     List<List<String>>? methods,
   });
 
-  Future<bool> redirectToWallet(PairingMetadata? metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  });
 }
diff --git a/lib/apis/sign_api/i_sign_engine_wallet.dart b/lib/apis/sign_api/i_sign_engine_wallet.dart
index 5c996b47..08d6e68e 100644
--- a/lib/apis/sign_api/i_sign_engine_wallet.dart
+++ b/lib/apis/sign_api/i_sign_engine_wallet.dart
@@ -116,5 +116,8 @@ abstract class ISignEngineWallet extends ISignEngineCommon {
 
   Map<int, PendingSessionAuthRequest> getPendingSessionAuthRequests();
 
-  Future<bool> redirectToDapp(PairingMetadata? metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  });
 }
diff --git a/lib/apis/sign_api/sign_client.dart b/lib/apis/sign_api/sign_client.dart
index 5e8e281f..4a18bc98 100644
--- a/lib/apis/sign_api/sign_client.dart
+++ b/lib/apis/sign_api/sign_client.dart
@@ -677,13 +677,25 @@ class SignClient implements ISignClient {
   }
 
   @override
-  Future<bool> redirectToDapp(PairingMetadata? metadata) {
-    return engine.redirectToDapp(metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return engine.redirectToDapp(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override
-  Future<bool> redirectToWallet(PairingMetadata? metadata) {
-    return engine.redirectToWallet(metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return engine.redirectToWallet(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index 0b38c88a..c2ccdb2e 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -532,6 +532,8 @@ class SignEngine implements ISignEngine {
         transportType: session?.transportType ?? TransportType.relay,
       ),
       appLink: isLinkMode ? session?.peer.metadata.redirect?.universal : null,
+      encodeOptions:
+          isLinkMode ? EncodeOptions(type: EncodeOptions.TYPE_2) : null,
     );
   }
 
@@ -2431,6 +2433,8 @@ class SignEngine implements ISignEngine {
         request.toJson(),
         id: id,
         ttl: expiry,
+        encodeOptions:
+            isLinkMode ? EncodeOptions(type: EncodeOptions.TYPE_2) : null,
         appLink: isLinkMode ? walletUniversalLink : null,
         // We don't want to open the appLink in this case as it will be opened by the host app
         openUrl: false,
@@ -3028,22 +3032,33 @@ class SignEngine implements ISignEngine {
   }
 
   @override
-  Future<bool> redirectToDapp(PairingMetadata? metadata) {
-    return _callRedirect(metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return _callRedirect(topic, redirect);
   }
 
   @override
-  Future<bool> redirectToWallet(PairingMetadata? metadata) {
-    return _callRedirect(metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return _callRedirect(topic, redirect);
   }
 
-  Future<bool> _callRedirect(PairingMetadata? metadata) async {
-    if (_isLinkModeEnabled(metadata)) {
-      // linkMode redirection is already handled in the engine
-      return false;
+  Future<bool> _callRedirect(String topic, Redirect? redirect) async {
+    final hasSession = topic.isNotEmpty && sessions.has(topic);
+    if (hasSession) {
+      final session = sessions.get(topic)!;
+      final isLinkMode = session.transportType.isLinkMode;
+      final isEnabled = _isLinkModeEnabled(session.peer.metadata);
+      if (isLinkMode && isEnabled) {
+        // linkMode redirection is already handled in the requests
+        return false;
+      }
     }
 
-    final redirect = metadata?.redirect;
     final scheme = redirect?.native;
     try {
       if (scheme == null) {
diff --git a/lib/apis/web3app/web3app.dart b/lib/apis/web3app/web3app.dart
index 3cbde673..5836eef9 100644
--- a/lib/apis/web3app/web3app.dart
+++ b/lib/apis/web3app/web3app.dart
@@ -352,8 +352,14 @@ class Web3App implements IWeb3App {
   }
 
   @override
-  Future<bool> redirectToWallet(PairingMetadata? metadata) {
-    return signEngine.redirectToWallet(metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return signEngine.redirectToWallet(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override
diff --git a/lib/apis/web3wallet/web3wallet.dart b/lib/apis/web3wallet/web3wallet.dart
index aa03bf01..0654d480 100644
--- a/lib/apis/web3wallet/web3wallet.dart
+++ b/lib/apis/web3wallet/web3wallet.dart
@@ -404,8 +404,14 @@ class Web3Wallet implements IWeb3Wallet {
   }
 
   @override
-  Future<bool> redirectToDapp(PairingMetadata? metadata) {
-    return signEngine.redirectToDapp(metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return signEngine.redirectToDapp(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override
diff --git a/test/sign_api/utils/sign_client_test_wrapper.dart b/test/sign_api/utils/sign_client_test_wrapper.dart
index e726c8e7..d4b7414b 100644
--- a/test/sign_api/utils/sign_client_test_wrapper.dart
+++ b/test/sign_api/utils/sign_client_test_wrapper.dart
@@ -430,13 +430,25 @@ class SignClientTestWrapper implements ISignEngine {
   }
 
   @override
-  Future<bool> redirectToDapp(PairingMetadata? metadata) {
-    return client.redirectToDapp(metadata);
+  Future<bool> redirectToDapp({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return client.redirectToDapp(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override
-  Future<bool> redirectToWallet(PairingMetadata? metadata) {
-    return client.redirectToWallet(metadata);
+  Future<bool> redirectToWallet({
+    required String topic,
+    required Redirect? redirect,
+  }) {
+    return client.redirectToWallet(
+      topic: topic,
+      redirect: redirect,
+    );
   }
 
   @override

From b5e104bc6898868007ee846cdf00b385e16b64f9 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 26 Aug 2024 15:31:50 +0200
Subject: [PATCH 08/22] remove comments

---
 example/dapp/lib/pages/pairings_page.dart     |  1 -
 example/dapp/lib/pages/sessions_page.dart     |  1 -
 .../android/app/src/main/AndroidManifest.xml  |  4 +-
 example/wallet/lib/pages/apps_page.dart       |  9 +--
 .../wc_connection_request_widget.dart         | 19 -----
 lib/apis/core/i_core.dart                     |  2 -
 lib/apis/core/pairing/i_pairing.dart          |  5 --
 lib/apis/core/pairing/pairing.dart            | 73 -------------------
 .../core/relay_auth/relay_auth_constants.dart |  3 -
 lib/apis/core/relay_client/relay_client.dart  |  4 +-
 lib/apis/sign_api/sign_engine.dart            | 44 +++++------
 11 files changed, 23 insertions(+), 142 deletions(-)
 delete mode 100644 lib/apis/core/relay_auth/relay_auth_constants.dart

diff --git a/example/dapp/lib/pages/pairings_page.dart b/example/dapp/lib/pages/pairings_page.dart
index 0cd314ca..eb5be822 100644
--- a/example/dapp/lib/pages/pairings_page.dart
+++ b/example/dapp/lib/pages/pairings_page.dart
@@ -39,7 +39,6 @@ class PairingsPageState extends State<PairingsPage> {
 
   @override
   Widget build(BuildContext context) {
-    debugPrint('[$runtimeType] _pairings ${_pairings.length}');
     final List<PairingItem> pairingItems = _pairings
         .map(
           (PairingInfo pairing) => PairingItem(
diff --git a/example/dapp/lib/pages/sessions_page.dart b/example/dapp/lib/pages/sessions_page.dart
index 9f6305f0..30ca5a9d 100644
--- a/example/dapp/lib/pages/sessions_page.dart
+++ b/example/dapp/lib/pages/sessions_page.dart
@@ -41,7 +41,6 @@ class SessionsPageState extends State<SessionsPage> {
   @override
   Widget build(BuildContext context) {
     final List<SessionData> sessions = _activeSessions.values.toList();
-    debugPrint('[$runtimeType] sessions ${sessions.length}');
     return Center(
       child: Container(
         constraints: const BoxConstraints(
diff --git a/example/wallet/android/app/src/main/AndroidManifest.xml b/example/wallet/android/app/src/main/AndroidManifest.xml
index 0430b51c..98f71eef 100644
--- a/example/wallet/android/app/src/main/AndroidManifest.xml
+++ b/example/wallet/android/app/src/main/AndroidManifest.xml
@@ -50,7 +50,7 @@
 
                 <data android:scheme="wcflutterwallet-internal" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -60,7 +60,7 @@
                 <data android:host="lab.web3modal.com" />
                 <data android:pathPattern="/flutter_walletkit" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/example/wallet/lib/pages/apps_page.dart b/example/wallet/lib/pages/apps_page.dart
index 2a84b170..621117c5 100644
--- a/example/wallet/lib/pages/apps_page.dart
+++ b/example/wallet/lib/pages/apps_page.dart
@@ -38,7 +38,6 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
     //
     _registerListeners();
     // TODO web3Wallet.core.echo.register(firebaseAccessToken);
-    // DeepLinkHandler.onLink.listen(_onFoundUri);
     DeepLinkHandler.checkInitialLink();
   }
 
@@ -141,9 +140,6 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Widget _buildNoPairingMessage() {
-    debugPrint('NO PAIRINGS');
-    final sessionsWithNoPairings = _web3Wallet.sessions.getAll();
-    debugPrint('${sessionsWithNoPairings.length} SESSIONS WITH NO PAIRINGS');
     return const Center(
       child: Text(
         StringConstants.noApps,
@@ -154,7 +150,6 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Widget _buildPairingList() {
-    debugPrint('${_pairings.length} PAIRINGS');
     final pairingItems = _pairings
         .map(
           (PairingInfo pairing) => PairingItem(
@@ -216,12 +211,10 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Future<void> _onFoundUri(String? uri) async {
-    debugPrint('[SampleWallet] _onFoundUri $uri');
     if ((uri ?? '').isEmpty) return;
     try {
       DeepLinkHandler.waiting.value = true;
-      final Uri uriData = Uri.parse(uri!);
-      await _web3Wallet.pair(uri: uriData);
+      await _web3Wallet.pair(uri: Uri.parse(uri!));
     } on WalletConnectError catch (e) {
       _showErrorDialog('${e.code}: ${e.message}');
     } on TimeoutException catch (_) {
diff --git a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
index 9321aacc..ef292b3a 100644
--- a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
+++ b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
@@ -32,8 +32,6 @@ class WCConnectionRequestWidget extends StatelessWidget {
       return const Text('ERROR');
     }
 
-    // final web3wallet = GetIt.I<IWeb3WalletService>().web3wallet;
-    // final linkMode = web3wallet.isTransportTypeLinkMode(requester?.metadata);
     return Container(
       decoration: BoxDecoration(
         color: Colors.white,
@@ -51,23 +49,6 @@ class WCConnectionRequestWidget extends StatelessWidget {
             ),
             textAlign: TextAlign.center,
           ),
-          // RichText(
-          //   text: TextSpan(
-          //     style: StyleConstants.bodyText.copyWith(
-          //       color: Colors.black,
-          //     ),
-          //     children: [
-          //       const TextSpan(text: 'Transport Type: '),
-          //       TextSpan(
-          //         text: linkMode ? 'LinkMode' : 'Relay',
-          //         style: StyleConstants.bodyText.copyWith(
-          //           color: linkMode ? Colors.blue : Colors.green,
-          //           fontWeight: FontWeight.bold,
-          //         ),
-          //       ),
-          //     ],
-          //   ),
-          // ),
           const SizedBox(height: StyleConstants.linear8),
           VerifyContextWidget(
             verifyContext: verifyContext,
diff --git a/lib/apis/core/i_core.dart b/lib/apis/core/i_core.dart
index 47d4dee1..02c1e4af 100644
--- a/lib/apis/core/i_core.dart
+++ b/lib/apis/core/i_core.dart
@@ -6,10 +6,8 @@ import 'package:walletconnect_flutter_v2/apis/core/heartbit/i_heartbeat.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_expirer.dart';
 import 'package:walletconnect_flutter_v2/apis/core/pairing/i_pairing.dart';
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/i_relay_client.dart';
-// import 'package:walletconnect_flutter_v2/apis/core/store/generic_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/i_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart';
-// import 'package:walletconnect_flutter_v2/apis/core/store/supported_linkmode_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/verify/i_verify.dart';
 
 abstract class ICore {
diff --git a/lib/apis/core/pairing/i_pairing.dart b/lib/apis/core/pairing/i_pairing.dart
index 266ba820..d3601e7b 100644
--- a/lib/apis/core/pairing/i_pairing.dart
+++ b/lib/apis/core/pairing/i_pairing.dart
@@ -89,9 +89,4 @@ abstract class IPairing {
     required String envelope,
     required bool sessionExists,
   });
-
-  // bool isTransportTypeLinkMode({
-  //   required Redirect? self,
-  //   required Redirect? peer,
-  // });
 }
diff --git a/lib/apis/core/pairing/pairing.dart b/lib/apis/core/pairing/pairing.dart
index 79a3aa43..6a6595da 100644
--- a/lib/apis/core/pairing/pairing.dart
+++ b/lib/apis/core/pairing/pairing.dart
@@ -679,37 +679,11 @@ class Pairing implements IPairing {
     await _resubscribeAll();
   }
 
-  // Future<Map<String, dynamic>?> _decodeMessageEvent(MessageEvent event) async {
-  //   // If we have a reciever public key for the topic, use it
-  //   ReceiverPublicKey? receiverPublicKey =
-  //       topicToReceiverPublicKey.get(event.topic);
-  //   // If there was a public key, delete it. One use.
-  //   if (receiverPublicKey != null) {
-  //     await topicToReceiverPublicKey.delete(event.topic);
-  //   }
-
-  //   // Decode the message
-  //   String? payloadString = await core.crypto.decode(
-  //     event.topic,
-  //     event.message,
-  //     options: DecodeOptions(
-  //       receiverPublicKey: receiverPublicKey?.publicKey,
-  //     ),
-  //   );
-
-  //   if (payloadString == null) {
-  //     return null;
-  //   }
-
-  //   return jsonDecode(payloadString) as Map<String, dynamic>;
-  // }
-
   void _onMessageEvent(MessageEvent? event) async {
     if (event == null) {
       return;
     }
 
-    // Map<String, dynamic>? data = await _decodeMessageEvent(event);
     // If we have a reciever public key for the topic, use it
     ReceiverPublicKey? receiverPublicKey =
         topicToReceiverPublicKey.get(event.topic);
@@ -762,57 +736,10 @@ class Pairing implements IPairing {
           pendingRequests[response.id]!.response = response.result;
           pendingRequests[response.id]!.completer.complete(response.result);
         }
-      } else {
-        // LinkMode's wc_sessionAuthenticate responsed will land here. It's ok.
       }
     }
   }
 
-  // void _onLinkModeEvent(MessageEvent? event) async {
-  //   if (event == null) {
-  //     return;
-  //   }
-
-  //   Map<String, dynamic>? data = await _decodeMessageEvent(event);
-
-  //   if (data == null) {
-  //     return;
-  //   }
-
-  //   core.logger.i('Pairing _onLinkModeEvent, Received data: $data');
-
-  //   // If it's an rpc request, handle it
-  //   if (data.containsKey('method')) {
-  //     final request = JsonRpcRequest.fromJson(data);
-
-  //     if (routerMapRequest.containsKey(request.method)) {
-  //       routerMapRequest[request.method]!.function(
-  //         event.topic,
-  //         request,
-  //         event.transportType,
-  //       );
-  //     } else {
-  //       _onUnkownRpcMethodRequest(event.topic, request);
-  //     }
-  //     // Otherwise handle it as a response
-  //   } else {
-  //     final response = JsonRpcResponse.fromJson(data);
-  //     core.logger.d('[$runtimeType] linkMode event response $response');
-
-  //     if (pendingRequests.containsKey(response.id)) {
-  //       if (response.error != null) {
-  //         pendingRequests[response.id]!.error = response.error;
-  //         pendingRequests[response.id]!.completer.completeError(
-  //               response.error!,
-  //             );
-  //       } else {
-  //         pendingRequests[response.id]!.response = response.result;
-  //         pendingRequests[response.id]!.completer.complete(response.result);
-  //       }
-  //     }
-  //   }
-  // }
-
   Future<void> _onPairingPingRequest(
     String topic,
     JsonRpcRequest request, [
diff --git a/lib/apis/core/relay_auth/relay_auth_constants.dart b/lib/apis/core/relay_auth/relay_auth_constants.dart
deleted file mode 100644
index af371c1c..00000000
--- a/lib/apis/core/relay_auth/relay_auth_constants.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-// class RelayAuthConstants {
-//   static const String JWT_ENCODING = 'base64url';
-// }
diff --git a/lib/apis/core/relay_client/relay_client.dart b/lib/apis/core/relay_client/relay_client.dart
index 4ccf9112..d1afeb6b 100644
--- a/lib/apis/core/relay_client/relay_client.dart
+++ b/lib/apis/core/relay_client/relay_client.dart
@@ -356,14 +356,12 @@ class RelayClient implements IRelayClient {
     return '${WalletConnectConstants.RELAYER_DEFAULT_PROTOCOL}_$method';
   }
 
-  // This method could be directly in pairings API
-  // but it's place here for consistency with onRelayClientMessage
+  // This method could be placed directly into pairings API but it's place here for consistency with onRelayClientMessage
   @override
   Future<bool> handleLinkModeMessage(String topic, String message) async {
     core.logger.t('[$runtimeType]: handleLinkModeMessage: $topic, $message');
 
     // Record a message event
-    // TODO LinkMode probably not needed
     await messageTracker.recordMessageEvent(topic, message);
 
     // Broadcast the message
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index c2ccdb2e..d554ffef 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -618,8 +618,9 @@ class SignEngine implements ISignEngine {
 
     final appLink = _getAppLinkIfEnabled(session?.peer.metadata);
 
-    // final SessionRequest req = pendingRequests.get(response.id.toString())!;
-    // print('respondSessionRequest: ${req.toJson()}');
+    final EncodeOptions? encodeOptions =
+        isLinkModeSession ? EncodeOptions(type: EncodeOptions.TYPE_2) : null;
+
     if (response.result != null) {
       await core.pairing.sendResult(
         response.id,
@@ -627,6 +628,7 @@ class SignEngine implements ISignEngine {
         MethodConstants.WC_SESSION_REQUEST,
         response.result,
         appLink: appLink,
+        encodeOptions: encodeOptions,
       );
     } else {
       await core.pairing.sendError(
@@ -635,6 +637,7 @@ class SignEngine implements ISignEngine {
         MethodConstants.WC_SESSION_REQUEST,
         response.error!,
         appLink: appLink,
+        encodeOptions: encodeOptions,
       );
     }
 
@@ -1025,11 +1028,11 @@ class SignEngine implements ISignEngine {
       type: ProtocolType.sign,
     );
     // FORMER AUTH ENGINE PROPERTY
-    // core.pairing.register(
-    //   method: MethodConstants.WC_AUTH_REQUEST,
-    //   function: _onAuthRequest,
-    //   type: ProtocolType.sign,
-    // );
+    core.pairing.register(
+      method: MethodConstants.WC_AUTH_REQUEST,
+      function: _onAuthRequest,
+      type: ProtocolType.sign,
+    );
   }
 
   bool _shouldIgnoreSessionPropose(String topic) {
@@ -2293,7 +2296,7 @@ class SignEngine implements ISignEngine {
         metadata: metadata,
       ),
       expiryTimestamp: expiryTimestamp.millisecondsSinceEpoch,
-      transportType: transportType, // TODO LinkMode remove? Ask Nacho
+      transportType: transportType, // TODO LinkMode remove? Ask Nacho or Gancho
     );
 
     // Set the one time use receiver public key for decoding the Type 1 envelope
@@ -2305,18 +2308,6 @@ class SignEngine implements ISignEngine {
 
     Completer<SessionAuthResponse> completer = Completer();
 
-    // pendingSessionAuthRequests.add(
-    //   SessionAuthenticateCompleter(
-    //     id: id,
-    //     pairingTopic: pTopic,
-    //     responseTopic: responseTopic,
-    //     selfPublicKey: publicKey,
-    //     request: request,
-    //     walletUniversalLink: walletUniversalLink,
-    //     completer: completer,
-    //   ),
-    // );
-
     // ----- build fallback session proposal request ----- //
 
     final fallbackMethod = MethodConstants.WC_SESSION_PROPOSE;
@@ -2692,7 +2683,9 @@ class SignEngine implements ISignEngine {
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
 
     final encodeOpts = EncodeOptions(
-      type: EncodeOptions.TYPE_1,
+      type: pendingRequest.transportType.isLinkMode
+          ? EncodeOptions.TYPE_2
+          : EncodeOptions.TYPE_1,
       receiverPublicKey: receiverPublicKey,
       senderPublicKey: senderPublicKey,
     );
@@ -2828,7 +2821,9 @@ class SignEngine implements ISignEngine {
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
 
     final encodeOpts = EncodeOptions(
-      type: EncodeOptions.TYPE_1,
+      type: pendingRequest.transportType.isLinkMode
+          ? EncodeOptions.TYPE_2
+          : EncodeOptions.TYPE_1,
       receiverPublicKey: receiverPublicKey,
       senderPublicKey: senderPublicKey,
     );
@@ -2850,12 +2845,11 @@ class SignEngine implements ISignEngine {
   }
 
   // FORMER AUTH ENGINE PROPERTY
-  // ignore: unused_element
   void _onAuthRequest(
     String topic,
-    JsonRpcRequest payload, {
+    JsonRpcRequest payload, [
     TransportType transportType = TransportType.relay,
-  }) async {
+  ]) async {
     try {
       final request = WcAuthRequestRequest.fromJson(payload.params);
 

From 1d58c920cc00b5d3a4c013cff44c37d44a17fc54 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 26 Aug 2024 22:20:24 +0200
Subject: [PATCH 09/22] some tests added

---
 lib/apis/core/pairing/i_pairing.dart |  1 -
 lib/apis/core/pairing/pairing.dart   |  1 -
 lib/apis/sign_api/sign_engine.dart   |  1 -
 test/sign_api/sign_engine_test.dart  | 12 ++++++------
 test/sign_api/tests/sign_common.dart | 12 ++++++++++++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/apis/core/pairing/i_pairing.dart b/lib/apis/core/pairing/i_pairing.dart
index d3601e7b..3af3e6eb 100644
--- a/lib/apis/core/pairing/i_pairing.dart
+++ b/lib/apis/core/pairing/i_pairing.dart
@@ -87,6 +87,5 @@ abstract class IPairing {
   void dispatchEnvelope({
     required String topic,
     required String envelope,
-    required bool sessionExists,
   });
 }
diff --git a/lib/apis/core/pairing/pairing.dart b/lib/apis/core/pairing/pairing.dart
index 6a6595da..4faa35c0 100644
--- a/lib/apis/core/pairing/pairing.dart
+++ b/lib/apis/core/pairing/pairing.dart
@@ -873,7 +873,6 @@ class Pairing implements IPairing {
   void dispatchEnvelope({
     required String topic,
     required String envelope,
-    required bool sessionExists,
   }) async {
     core.logger.i('[$runtimeType] dispatchEnvelope $topic, $envelope');
 
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index d554ffef..d157f227 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -3002,7 +3002,6 @@ class SignEngine implements ISignEngine {
     core.pairing.dispatchEnvelope(
       topic: topic,
       envelope: envelope,
-      sessionExists: (session != null),
     );
   }
 
diff --git a/test/sign_api/sign_engine_test.dart b/test/sign_api/sign_engine_test.dart
index b30f6d5e..2ac38887 100644
--- a/test/sign_api/sign_engine_test.dart
+++ b/test/sign_api/sign_engine_test.dart
@@ -22,7 +22,7 @@ void main() {
         logLevel: LogLevel.info,
         httpClient: getHttpWrapper(),
       );
-      ISignEngine e = SignEngine(
+      ISignEngine engineA = SignEngine(
         core: core,
         metadata: metadata,
         proposals: GenericStore(
@@ -91,9 +91,9 @@ void main() {
         ),
       );
       await core.start();
-      await e.init();
+      await engineA.init();
 
-      return e;
+      return engineA;
     },
     clientBCreator: (PairingMetadata metadata) async {
       final core = Core(
@@ -103,7 +103,7 @@ void main() {
         logLevel: LogLevel.info,
         httpClient: getHttpWrapper(),
       );
-      ISignEngine e = SignEngine(
+      ISignEngine engineB = SignEngine(
         core: core,
         metadata: metadata,
         proposals: GenericStore(
@@ -172,9 +172,9 @@ void main() {
         ),
       );
       await core.start();
-      await e.init();
+      await engineB.init();
 
-      return e;
+      return engineB;
     },
   );
 }
diff --git a/test/sign_api/tests/sign_common.dart b/test/sign_api/tests/sign_common.dart
index 1d677a2d..d1e598b0 100644
--- a/test/sign_api/tests/sign_common.dart
+++ b/test/sign_api/tests/sign_common.dart
@@ -9,6 +9,8 @@ import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import '../../shared/shared_test_values.dart';
 import 'sign_approve_session.dart';
 import '../utils/sign_client_constants.dart';
+import 'sign_approve_session_authenticate.dart';
+import 'sign_authenticate.dart';
 import 'sign_connect.dart';
 import 'sign_disconnect.dart';
 import 'sign_emit_session_event.dart';
@@ -58,6 +60,11 @@ void signEngineTests({
       clientBCreator: clientBCreator,
     );
 
+    signAuthenticate(
+      clientACreator: clientACreator,
+      clientBCreator: clientBCreator,
+    );
+
     signPair(
       clientACreator: clientACreator,
       clientBCreator: clientBCreator,
@@ -68,6 +75,11 @@ void signEngineTests({
       clientBCreator: clientBCreator,
     );
 
+    signApproveSessionAuthenticate(
+      clientACreator: clientACreator,
+      clientBCreator: clientBCreator,
+    );
+
     signRejectSession(
       clientACreator: clientACreator,
       clientBCreator: clientBCreator,

From 7e0d836f2c1767f2ddad8fc01aefc07d2f77b8ed Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 26 Aug 2024 22:20:37 +0200
Subject: [PATCH 10/22] some tests added

---
 .../sign_approve_session_authenticate.dart    |  70 ++++++++++++
 test/sign_api/tests/sign_authenticate.dart    | 101 ++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 test/sign_api/tests/sign_approve_session_authenticate.dart
 create mode 100644 test/sign_api/tests/sign_authenticate.dart

diff --git a/test/sign_api/tests/sign_approve_session_authenticate.dart b/test/sign_api/tests/sign_approve_session_authenticate.dart
new file mode 100644
index 00000000..097eadbb
--- /dev/null
+++ b/test/sign_api/tests/sign_approve_session_authenticate.dart
@@ -0,0 +1,70 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_app.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_common.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_wallet.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+import '../../auth_api/utils/engine_constants.dart';
+import '../../shared/shared_test_values.dart';
+import '../utils/engine_constants.dart';
+
+void signApproveSessionAuthenticate({
+  required Future<ISignEngineApp> Function(PairingMetadata) clientACreator,
+  required Future<ISignEngineWallet> Function(PairingMetadata) clientBCreator,
+}) {
+  group('approveSessionAuthenticate', () {
+    late ISignEngineApp clientA;
+    late ISignEngineWallet clientB;
+    List<ISignEngineCommon> clients = [];
+
+    setUp(() async {
+      clientA = await clientACreator(PROPOSER.copyWith(
+        redirect: Redirect(
+          native: 'clientA://',
+          universal: 'https://lab.web3modal.com/dapp',
+          linkMode: true,
+        ),
+      ));
+      clientB = await clientBCreator(RESPONDER.copyWith(
+        redirect: Redirect(
+          native: 'clientB://',
+          universal: 'https://lab.web3modal.com/wallet',
+          linkMode: true,
+        ),
+      ));
+      await clientA.core.addLinkModeSupportedApp(
+        'https://lab.web3modal.com/wallet',
+      );
+      await clientB.core.addLinkModeSupportedApp(
+        'https://lab.web3modal.com/dapp',
+      );
+      clients.add(clientA);
+      clients.add(clientB);
+
+      await clientB.sessionAuthRequests.set(
+        TEST_PROPOSAL_VALID_ID.toString(),
+        PendingSessionAuthRequest(
+          id: TEST_PROPOSAL_VALID_ID,
+          pairingTopic: TEST_PAIRING_TOPIC,
+          requester: TEST_CONNECTION_METADATA_REQUESTER.copyWith(
+            publicKey: TEST_KEY_PAIRS['A']!.publicKey,
+          ),
+          authPayload: CacaoRequestPayload.fromCacaoPayload(testCacaoPayload),
+          expiryTimestamp: 1000000000000,
+          verifyContext: VerifyContext(
+            origin: 'test.com',
+            validation: Validation.VALID,
+            verifyUrl: WalletConnectConstants.VERIFY_SERVER,
+          ),
+          transportType: TransportType.linkMode,
+        ),
+      );
+    });
+
+    tearDown(() async {
+      clients.clear();
+      await clientA.core.relayClient.disconnect();
+      await clientB.core.relayClient.disconnect();
+    });
+  });
+}
diff --git a/test/sign_api/tests/sign_authenticate.dart b/test/sign_api/tests/sign_authenticate.dart
new file mode 100644
index 00000000..6dbd032b
--- /dev/null
+++ b/test/sign_api/tests/sign_authenticate.dart
@@ -0,0 +1,101 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_app.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_common.dart';
+import 'package:walletconnect_flutter_v2/apis/sign_api/i_sign_engine_wallet.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+import '../../shared/shared_test_values.dart';
+
+void signAuthenticate({
+  required Future<ISignEngineApp> Function(PairingMetadata) clientACreator,
+  required Future<ISignEngineWallet> Function(PairingMetadata) clientBCreator,
+}) {
+  group('happy path', () {
+    late ISignEngineApp clientA;
+    late ISignEngineWallet clientB;
+    List<ISignEngineCommon> clients = [];
+
+    setUp(() async {
+      clientA = await clientACreator(PROPOSER.copyWith(
+        redirect: Redirect(
+          native: 'clientA://',
+          universal: 'https://lab.web3modal.com/dapp',
+          linkMode: true,
+        ),
+      ));
+      clientB = await clientBCreator(RESPONDER.copyWith(
+        redirect: Redirect(
+          native: 'clientB://',
+          universal: 'https://lab.web3modal.com/wallet',
+          linkMode: true,
+        ),
+      ));
+      clients.add(clientA);
+      clients.add(clientB);
+    });
+
+    tearDown(() async {
+      clients.clear();
+      await clientA.core.relayClient.disconnect();
+      await clientB.core.relayClient.disconnect();
+    });
+
+    test('Initializes', () async {
+      expect(clientA.core.pairing.getPairings().length, 0);
+      expect(clientB.core.pairing.getPairings().length, 0);
+    });
+
+    test('creates correct URI for LinkMode', () async {
+      await clientA.core.addLinkModeSupportedApp(
+        'https://lab.web3modal.com/wallet',
+      );
+      await clientB.core.addLinkModeSupportedApp(
+        'https://lab.web3modal.com/dapp',
+      );
+
+      SessionAuthRequestResponse response = await clientA.authenticate(
+        params: SessionAuthRequestParams(
+          chains: ['eip155:1'],
+          domain: 'lab.web3modal.com',
+          nonce: 'XpJ0thNvq9lNixmwN',
+          uri: 'https://lab.web3modal.com/dapp',
+          statement: 'Connect to Web3Modal Lab',
+          methods: ['personal_sign'],
+        ),
+        walletUniversalLink: 'https://lab.web3modal.com/wallet',
+      );
+
+      expect(response.uri != null, true);
+      final envelope = WalletConnectUtils.getSearchParamFromURL(
+        '${response.uri}',
+        'wc_ev',
+      );
+      final message = Uri.decodeComponent(envelope);
+
+      final topic = WalletConnectUtils.getSearchParamFromURL(
+        '${response.uri}',
+        'topic',
+      );
+      expect(message.isNotEmpty, true);
+      expect(topic.isNotEmpty, true);
+      expect(topic, response.pairingTopic);
+
+      // Decode the message
+      String? payloadString = await clientA.core.crypto.decode(
+        topic,
+        message,
+      );
+      expect(payloadString, isNotNull);
+
+      Map<String, dynamic> data = jsonDecode(payloadString!);
+
+      expect(data.containsKey('method'), true);
+
+      final request = JsonRpcRequest.fromJson(data);
+
+      expect(request.method, MethodConstants.WC_SESSION_AUTHENTICATE);
+    });
+  });
+}

From 17237f0d9d33420ba28dd8b8dad36ce04a9787c0 Mon Sep 17 00:00:00 2001
From: Alfreedom <alfredo@walletconnect.com>
Date: Mon, 26 Aug 2024 22:21:23 +0200
Subject: [PATCH 11/22] Update
 example/wallet/lib/dependencies/web3wallet_service.dart

Co-authored-by: Ignacio Santise <25931366+ignaciosantise@users.noreply.github.com>
---
 example/wallet/lib/dependencies/web3wallet_service.dart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 8f488b85..bf7b8bd7 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -268,10 +268,6 @@ class Web3WalletService extends IWeb3WalletService {
     if (args != null) {
       final session = jsonEncode(args.session.toJson());
       debugPrint('[SampleWallet] _onSessionConnect $session');
-      // MethodsUtils.handleRedirect(
-      //   args.session.topic,
-      //   args.session.peer.metadata.redirect,
-      // );
     }
   }
 

From 6673f8cd513b0e8b45686a5aadf11d7cca985127 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 27 Aug 2024 11:06:56 +0200
Subject: [PATCH 12/22] added linkmode from merge request

---
 .../android/app/src/main/AndroidManifest.xml  |  10 ++
 example/dapp/ios/Runner/Runner.entitlements   |   1 +
 example/dapp/lib/main.dart                    |  23 ++--
 example/dapp/lib/pages/connect_page.dart      |  31 +++--
 example/dapp/lib/utils/sample_wallets.dart    | 126 +++++++++---------
 .../android/app/src/main/AndroidManifest.xml  |  10 ++
 example/wallet/ios/Runner/Runner.entitlements |   1 +
 .../lib/dependencies/web3wallet_service.dart  |  23 ++--
 example/wallet/lib/pages/settings_page.dart   |  23 ++++
 9 files changed, 159 insertions(+), 89 deletions(-)

diff --git a/example/dapp/android/app/src/main/AndroidManifest.xml b/example/dapp/android/app/src/main/AndroidManifest.xml
index 42154613..ebfc9a9f 100644
--- a/example/dapp/android/app/src/main/AndroidManifest.xml
+++ b/example/dapp/android/app/src/main/AndroidManifest.xml
@@ -72,6 +72,16 @@
                 <data android:host="dev.lab.web3modal.com" />
                 <data android:pathPattern="/flutter_appkit_internal" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app" />
+                <data android:pathPattern="/flutter_appkit_internal" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/example/dapp/ios/Runner/Runner.entitlements b/example/dapp/ios/Runner/Runner.entitlements
index 84ca64b5..64aad23c 100644
--- a/example/dapp/ios/Runner/Runner.entitlements
+++ b/example/dapp/ios/Runner/Runner.entitlements
@@ -6,6 +6,7 @@
 	<array>
 		<string>applinks:lab.web3modal.com</string>
 		<string>applinks:dev.lab.web3modal.com</string>
+		<string>applinks:web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app</string>
 	</array>
 </dict>
 </plist>
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index bcd564f6..13566439 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -67,21 +67,24 @@ class _MyHomePageState extends State<MyHomePage> {
     return flavor.replaceAll('-production', '');
   }
 
-  String _universalLink() {
-    Uri link = Uri.parse('https://lab.web3modal.com/flutter_appkit');
+  String _universalLink(bool fromMR) {
+    Uri link = fromMR
+        ? Uri.parse(
+            'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_appkit')
+        : Uri.parse('https://lab.web3modal.com/flutter_appkit');
     if (_flavor.isNotEmpty) {
-      return link
-          .replace(path: '${link.path}_internal')
-          .replace(host: 'dev.${link.host}')
-          .toString();
+      if (!fromMR) {
+        link = link.replace(host: 'dev.${link.host}');
+      }
+      return link.replace(path: '${link.path}_internal').toString();
     }
     return link.toString();
   }
 
-  Redirect _constructRedirect() {
+  Redirect _constructRedirect(bool fromMR) {
     return Redirect(
       native: 'wcflutterdapp$_flavor://',
-      universal: _universalLink(),
+      universal: _universalLink(fromMR),
       // enable linkMode on Wallet so Dapps can use relay-less connection
       // universal: value must be set on cloud config as well
       linkMode: true,
@@ -89,6 +92,8 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<void> initialize() async {
+    final prefs = await SharedPreferences.getInstance();
+    final fromMR = prefs.getBool('_LM_from_MR') ?? false;
     _web3App = Web3App(
       core: Core(
         projectId: DartDefines.projectId,
@@ -101,7 +106,7 @@ class _MyHomePageState extends State<MyHomePage> {
         icons: [
           'https://images.prismic.io/wallet-connect/65785a56531ac2845a260732_WalletConnect-App-Logo-1024X1024.png'
         ],
-        redirect: _constructRedirect(),
+        redirect: _constructRedirect(fromMR),
       ),
     );
 
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index d2e8d617..6581e755 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -2,6 +2,7 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/foundation.dart';
@@ -35,6 +36,7 @@ class ConnectPage extends StatefulWidget {
 
 class ConnectPageState extends State<ConnectPage> {
   bool _testnetOnly = false;
+  bool _testFromMR = true;
   final List<ChainMetadata> _selectedChains = [];
   bool _shouldDismissQrCode = true;
   bool _initialized = false;
@@ -53,6 +55,9 @@ class ConnectPageState extends State<ConnectPage> {
 
     await _walletConnectModalService.init();
 
+    final prefs = await SharedPreferences.getInstance();
+    _testFromMR = prefs.getBool('_LM_from_MR') ?? false;
+
     setState(() => _initialized = true);
 
     widget.web3App.onSessionConnect.subscribe(_onSessionConnect);
@@ -64,13 +69,6 @@ class ConnectPageState extends State<ConnectPage> {
     super.dispose();
   }
 
-  void setTestnet(bool value) {
-    if (value != _testnetOnly) {
-      _selectedChains.clear();
-    }
-    _testnetOnly = value;
-  }
-
   void _selectChain(ChainMetadata chain) {
     setState(() {
       if (_selectedChains.contains(chain)) {
@@ -206,6 +204,19 @@ class ConnectPageState extends State<ConnectPage> {
                   });
                 },
               ),
+              const Expanded(child: SizedBox()),
+              const Text(
+                'LM from MR',
+                style: StyleConstants.buttonText,
+              ),
+              Switch(
+                value: _testFromMR,
+                onChanged: (value) async {
+                  final prefs = await SharedPreferences.getInstance();
+                  await prefs.setBool('_LM_from_MR', value);
+                  exit(0);
+                },
+              ),
             ],
           ),
         ),
@@ -253,7 +264,8 @@ class ConnectPageState extends State<ConnectPage> {
             Wrap(
               spacing: 8.0,
               runSpacing: 8.0,
-              children: WCSampleWallets.getSampleWallets().map((wallet) {
+              children:
+                  WCSampleWallets.getSampleWallets(_testFromMR).map((wallet) {
                 return SizedBox(
                   width: (MediaQuery.of(context).size.width / 2) - 16,
                   child: ElevatedButton(
@@ -294,7 +306,8 @@ class ConnectPageState extends State<ConnectPage> {
             Wrap(
               spacing: 8.0,
               runSpacing: 8.0,
-              children: WCSampleWallets.getSampleWallets().map((wallet) {
+              children:
+                  WCSampleWallets.getSampleWallets(_testFromMR).map((wallet) {
                 return SizedBox(
                   width: (MediaQuery.of(context).size.width / 2) - 16,
                   child: ElevatedButton(
diff --git a/example/dapp/lib/utils/sample_wallets.dart b/example/dapp/lib/utils/sample_wallets.dart
index fd866f12..01d8fa1e 100644
--- a/example/dapp/lib/utils/sample_wallets.dart
+++ b/example/dapp/lib/utils/sample_wallets.dart
@@ -1,69 +1,71 @@
 import 'dart:io';
 
 class WCSampleWallets {
-  static final List<Map<String, dynamic>> sampleWallets = [
-    {
-      'name': 'Swift Wallet',
-      'platform': ['ios'],
-      'id': '123456789012345678901234567890',
-      'schema': 'walletapp://',
-      'bundleId': 'com.walletconnect.sample.wallet',
-      'universal': 'https://lab.web3modal.com/wallet',
-    },
-    {
-      'name': 'Flutter Wallet',
-      'platform': ['ios', 'android'],
-      'id': '123456789012345678901234567891',
-      'schema': 'wcflutterwallet://',
-      'bundleId': 'com.walletconnect.flutterwallet',
-      'universal': 'https://lab.web3modal.com/flutter_walletkit',
-    },
-    {
-      'name': 'Flutter Wallet (internal)',
-      'platform': ['ios', 'android'],
-      'id': '123456789012345678901234567895',
-      'schema': 'wcflutterwallet-internal://',
-      'bundleId': 'com.walletconnect.flutterwallet.internal',
-      'universal': 'https://dev.lab.web3modal.com/flutter_walletkit_internal',
-    },
-    {
-      'name': 'RN Wallet',
-      'platform': ['ios', 'android'],
-      'id': '123456789012345678901234567892',
-      'schema': 'rn-web3wallet://',
-      'bundleId': 'com.walletconnect.web3wallet.rnsample',
-      'universal': 'https://lab.web3modal.com/rn_walletkit',
-    },
-    {
-      'name': 'RN Wallet (internal)',
-      'platform': ['ios', 'android'],
-      'id': '1234567890123456789012345678922',
-      'schema': 'rn-web3wallet://',
-      'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
-      'universal': 'https://lab.web3modal.com/rn_walletkit',
-    },
-    {
-      'name': 'Kotlin Wallet',
-      'platform': ['android'],
-      'id': '123456789012345678901234567893',
-      'schema': 'kotlin-web3wallet://',
-      'bundleId': 'com.walletconnect.sample.wallet',
-      'universal':
-          'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release',
-    },
-    {
-      'name': 'Kotlin Wallet (Internal)',
-      'platform': ['android'],
-      'id': '123456789012345678901234567894',
-      'schema': 'kotlin-web3wallet://',
-      'bundleId': 'com.walletconnect.sample.wallet.internal',
-      'universal':
-          'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
-    },
-  ];
+  static List<Map<String, dynamic>> sampleWallets(bool mr) => [
+        {
+          'name': 'Swift Wallet',
+          'platform': ['ios'],
+          'id': '123456789012345678901234567890',
+          'schema': 'walletapp://',
+          'bundleId': 'com.walletconnect.sample.wallet',
+          'universal': 'https://lab.web3modal.com/wallet',
+        },
+        {
+          'name': 'Flutter Wallet',
+          'platform': ['ios', 'android'],
+          'id': '123456789012345678901234567891',
+          'schema': 'wcflutterwallet://',
+          'bundleId': 'com.walletconnect.flutterwallet',
+          'universal': 'https://lab.web3modal.com/flutter_walletkit',
+        },
+        {
+          'name': 'Flutter Wallet (internal)',
+          'platform': ['ios', 'android'],
+          'id': '123456789012345678901234567895',
+          'schema': 'wcflutterwallet-internal://',
+          'bundleId': 'com.walletconnect.flutterwallet.internal',
+          'universal': mr
+              ? 'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_walletkit_internal'
+              : 'https://dev.lab.web3modal.com/flutter_walletkit_internal',
+        },
+        {
+          'name': 'RN Wallet',
+          'platform': ['ios', 'android'],
+          'id': '123456789012345678901234567892',
+          'schema': 'rn-web3wallet://',
+          'bundleId': 'com.walletconnect.web3wallet.rnsample',
+          'universal': 'https://lab.web3modal.com/rn_walletkit',
+        },
+        {
+          'name': 'RN Wallet (internal)',
+          'platform': ['ios', 'android'],
+          'id': '1234567890123456789012345678922',
+          'schema': 'rn-web3wallet://',
+          'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
+          'universal': 'https://lab.web3modal.com/rn_walletkit',
+        },
+        {
+          'name': 'Kotlin Wallet',
+          'platform': ['android'],
+          'id': '123456789012345678901234567893',
+          'schema': 'kotlin-web3wallet://',
+          'bundleId': 'com.walletconnect.sample.wallet',
+          'universal':
+              'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release',
+        },
+        {
+          'name': 'Kotlin Wallet (Internal)',
+          'platform': ['android'],
+          'id': '123456789012345678901234567894',
+          'schema': 'kotlin-web3wallet://',
+          'bundleId': 'com.walletconnect.sample.wallet.internal',
+          'universal':
+              'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
+        },
+      ];
 
-  static List<Map<String, dynamic>> getSampleWallets() {
-    return sampleWallets.where((e) {
+  static List<Map<String, dynamic>> getSampleWallets(bool mr) {
+    return sampleWallets(mr).where((e) {
       return (e['platform'] as List<String>).contains(Platform.operatingSystem);
     }).toList();
   }
diff --git a/example/wallet/android/app/src/main/AndroidManifest.xml b/example/wallet/android/app/src/main/AndroidManifest.xml
index 98f71eef..fe885279 100644
--- a/example/wallet/android/app/src/main/AndroidManifest.xml
+++ b/example/wallet/android/app/src/main/AndroidManifest.xml
@@ -70,6 +70,16 @@
                 <data android:host="dev.lab.web3modal.com" />
                 <data android:pathPattern="/flutter_walletkit_internal" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app" />
+                <data android:pathPattern="/flutter_walletkit_internal" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/example/wallet/ios/Runner/Runner.entitlements b/example/wallet/ios/Runner/Runner.entitlements
index da67a557..e60b8946 100644
--- a/example/wallet/ios/Runner/Runner.entitlements
+++ b/example/wallet/ios/Runner/Runner.entitlements
@@ -6,6 +6,7 @@
 	<array>
 		<string>applinks:lab.web3modal.com</string>
     <string>applinks:dev.lab.web3modal.com</string>
+		<string>applinks:web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app</string>
 	</array>
 </dict>
 </plist>
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index bf7b8bd7..194cfcde 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -29,21 +29,24 @@ class Web3WalletService extends IWeb3WalletService {
     return flavor.replaceAll('-production', '');
   }
 
-  String _universalLink() {
-    Uri link = Uri.parse('https://lab.web3modal.com/flutter_walletkit');
+  String _universalLink(fromMR) {
+    Uri link = fromMR
+        ? Uri.parse(
+            'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_walletkit')
+        : Uri.parse('https://lab.web3modal.com/flutter_walletkit');
     if (_flavor.isNotEmpty) {
-      return link
-          .replace(path: '${link.path}_internal')
-          .replace(host: 'dev.${link.host}')
-          .toString();
+      if (!fromMR) {
+        link = link.replace(host: 'dev.${link.host}');
+      }
+      return link.replace(path: '${link.path}_internal').toString();
     }
     return link.toString();
   }
 
-  Redirect _constructRedirect() {
+  Redirect _constructRedirect(bool fromMR) {
     return Redirect(
       native: 'wcflutterwallet$_flavor://',
-      universal: _universalLink(),
+      universal: _universalLink(fromMR),
       // enable linkMode on Wallet so Dapps can use relay-less connection
       // universal: value must be set on cloud config as well
       linkMode: true,
@@ -52,6 +55,8 @@ class Web3WalletService extends IWeb3WalletService {
 
   @override
   Future<void> create() async {
+    final prefs = await SharedPreferences.getInstance();
+    final fromMR = prefs.getBool('_LM_from_MR') ?? false;
     // Create the web3wallet
     _web3Wallet = Web3Wallet(
       core: Core(
@@ -65,7 +70,7 @@ class Web3WalletService extends IWeb3WalletService {
         icons: [
           'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png'
         ],
-        redirect: _constructRedirect(),
+        redirect: _constructRedirect(fromMR),
       ),
     );
 
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index 8898a883..cea1564d 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -1,5 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 
+import 'dart:io';
 import 'dart:math';
 import 'dart:ui';
 
@@ -76,6 +77,28 @@ class _SettingsPageState extends State<SettingsPage> {
                 _Metadata(),
                 const SizedBox(height: 20.0),
                 const Divider(height: 1.0),
+                FutureBuilder<SharedPreferences>(
+                  future: SharedPreferences.getInstance(),
+                  builder: (context, snapshot) {
+                    if (!snapshot.hasData) {
+                      return const SizedBox.shrink();
+                    }
+                    final prefs = snapshot.data as SharedPreferences;
+                    return Row(
+                      children: [
+                        const SizedBox(width: 20.0),
+                        const Text('LM from MR '),
+                        Switch(
+                          value: prefs.getBool('_LM_from_MR') ?? false,
+                          onChanged: (value) async {
+                            await prefs.setBool('_LM_from_MR', value);
+                            exit(0);
+                          },
+                        ),
+                      ],
+                    );
+                  },
+                ),
                 _Buttons(
                   onRestoreFromSeed: () async {
                     final mnemonic =

From 8e1303fffc2df08e34c4e631d24bcfec37958ebf Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 27 Aug 2024 11:59:56 +0200
Subject: [PATCH 13/22] fix on sample dapp

---
 example/dapp/lib/pages/connect_page.dart | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index 6581e755..54adada9 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -467,14 +467,17 @@ class ConnectPageState extends State<ConnectPage> {
       walletUniversalLink: universalLink,
     );
 
+    debugPrint('[SampleDapp] authResponse.uri ${authResponse.uri}');
     try {
-      debugPrint('[SampleDapp] authResponse.uri ${authResponse.uri}');
-      await WalletConnectUtils.openURL(authResponse.uri.toString());
+      // If response uri is not universalLink show QR Code
+      if (authResponse.uri?.authority != Uri.parse(universalLink).authority) {
+        _showQrCode('${authResponse.uri}', walletScheme: nativeLink);
+      } else {
+        await WalletConnectUtils.openURL(authResponse.uri.toString());
+      }
     } catch (e) {
-      _showQrCode(
-        authResponse.uri.toString(),
-        walletScheme: nativeLink,
-      );
+      debugPrint('[SampleDapp] authResponse error $e');
+      _showQrCode('${authResponse.uri}', walletScheme: nativeLink);
     }
 
     try {

From 896c279bddd6b402fbbf90fa4330e6df3efdfffc Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 27 Aug 2024 18:03:47 +0200
Subject: [PATCH 14/22] Bug fixes on wallets schemes

---
 example/dapp/lib/main.dart                              | 2 +-
 example/dapp/lib/pages/connect_page.dart                | 2 +-
 example/dapp/lib/utils/sample_wallets.dart              | 8 ++++----
 example/wallet/lib/dependencies/web3wallet_service.dart | 5 ++---
 example/wallet/lib/pages/settings_page.dart             | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index 13566439..30fe9abf 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -93,7 +93,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   Future<void> initialize() async {
     final prefs = await SharedPreferences.getInstance();
-    final fromMR = prefs.getBool('_LM_from_MR') ?? false;
+    final fromMR = prefs.getBool('_LM_from_MR') ?? true;
     _web3App = Web3App(
       core: Core(
         projectId: DartDefines.projectId,
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index 54adada9..f7b53dab 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -56,7 +56,7 @@ class ConnectPageState extends State<ConnectPage> {
     await _walletConnectModalService.init();
 
     final prefs = await SharedPreferences.getInstance();
-    _testFromMR = prefs.getBool('_LM_from_MR') ?? false;
+    _testFromMR = prefs.getBool('_LM_from_MR') ?? true;
 
     setState(() => _initialized = true);
 
diff --git a/example/dapp/lib/utils/sample_wallets.dart b/example/dapp/lib/utils/sample_wallets.dart
index 01d8fa1e..8f7ce16d 100644
--- a/example/dapp/lib/utils/sample_wallets.dart
+++ b/example/dapp/lib/utils/sample_wallets.dart
@@ -32,7 +32,7 @@ class WCSampleWallets {
           'name': 'RN Wallet',
           'platform': ['ios', 'android'],
           'id': '123456789012345678901234567892',
-          'schema': 'rn-web3wallet://',
+          'schema': 'rn-web3wallet://wc',
           'bundleId': 'com.walletconnect.web3wallet.rnsample',
           'universal': 'https://lab.web3modal.com/rn_walletkit',
         },
@@ -40,7 +40,7 @@ class WCSampleWallets {
           'name': 'RN Wallet (internal)',
           'platform': ['ios', 'android'],
           'id': '1234567890123456789012345678922',
-          'schema': 'rn-web3wallet://',
+          'schema': 'rn-web3wallet://wc',
           'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
           'universal': 'https://lab.web3modal.com/rn_walletkit',
         },
@@ -48,7 +48,7 @@ class WCSampleWallets {
           'name': 'Kotlin Wallet',
           'platform': ['android'],
           'id': '123456789012345678901234567893',
-          'schema': 'kotlin-web3wallet://',
+          'schema': 'kotlin-web3wallet://wc',
           'bundleId': 'com.walletconnect.sample.wallet',
           'universal':
               'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release',
@@ -57,7 +57,7 @@ class WCSampleWallets {
           'name': 'Kotlin Wallet (Internal)',
           'platform': ['android'],
           'id': '123456789012345678901234567894',
-          'schema': 'kotlin-web3wallet://',
+          'schema': 'kotlin-web3wallet://wc',
           'bundleId': 'com.walletconnect.sample.wallet.internal',
           'universal':
               'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 194cfcde..4a382f2e 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -1,9 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
-import 'dart:typed_data';
 
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
@@ -56,7 +55,7 @@ class Web3WalletService extends IWeb3WalletService {
   @override
   Future<void> create() async {
     final prefs = await SharedPreferences.getInstance();
-    final fromMR = prefs.getBool('_LM_from_MR') ?? false;
+    final fromMR = prefs.getBool('_LM_from_MR') ?? true;
     // Create the web3wallet
     _web3Wallet = Web3Wallet(
       core: Core(
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index cea1564d..fb76297c 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -89,7 +89,7 @@ class _SettingsPageState extends State<SettingsPage> {
                         const SizedBox(width: 20.0),
                         const Text('LM from MR '),
                         Switch(
-                          value: prefs.getBool('_LM_from_MR') ?? false,
+                          value: prefs.getBool('_LM_from_MR') ?? true,
                           onChanged: (value) async {
                             await prefs.setBool('_LM_from_MR', value);
                             exit(0);

From 60c083cdf41c947824a12094d453bbcbbe55165a Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 27 Aug 2024 19:12:49 +0200
Subject: [PATCH 15/22] added keystore secrets

---
 .github/workflows/release_dapp_android.yml            | 8 ++++++++
 .github/workflows/release_dapp_android_internal.yml   | 8 ++++++++
 .github/workflows/release_wallet_android.yml          | 8 ++++++++
 .github/workflows/release_wallet_android_internal.yml | 8 ++++++++
 .gitignore                                            | 3 +++
 example/dapp/android/app/build.gradle                 | 9 +++++++++
 example/wallet/android/app/build.gradle               | 9 +++++++++
 7 files changed, 53 insertions(+)

diff --git a/.github/workflows/release_dapp_android.yml b/.github/workflows/release_dapp_android.yml
index 3188d495..1bd92b45 100644
--- a/.github/workflows/release_dapp_android.yml
+++ b/.github/workflows/release_dapp_android.yml
@@ -38,6 +38,14 @@ jobs:
     
     # Install Flutter and Dependencies
     - uses: ./.github/actions/dependencies
+
+    - name: Add Secrets file
+      working-directory: example/dapp/android
+      run: touch secrets.properties && echo "${{ secrets.SECRETS_FILE }}" >> secrets.properties
+
+    - name: Add Keystore file
+      working-directory: example/dapp/android
+      run: echo ${{ secrets.KEYSTORE }} | base64 --decode >> app/debug.keystore
     
     # Fastlane
     - name: Fastlane
diff --git a/.github/workflows/release_dapp_android_internal.yml b/.github/workflows/release_dapp_android_internal.yml
index dd7c9c2e..e69f85ba 100644
--- a/.github/workflows/release_dapp_android_internal.yml
+++ b/.github/workflows/release_dapp_android_internal.yml
@@ -38,6 +38,14 @@ jobs:
     
     # Install Flutter and Dependencies
     - uses: ./.github/actions/dependencies
+
+    - name: Add Secrets file
+      working-directory: example/dapp/android
+      run: touch secrets.properties && echo "${{ secrets.SECRETS_FILE }}" >> secrets.properties
+
+    - name: Add Keystore file
+      working-directory: example/dapp/android
+      run: echo ${{ secrets.KEYSTORE }} | base64 --decode >> app/debug.keystore
     
     # Fastlane
     - name: Fastlane
diff --git a/.github/workflows/release_wallet_android.yml b/.github/workflows/release_wallet_android.yml
index 224b336d..0e5a0e21 100644
--- a/.github/workflows/release_wallet_android.yml
+++ b/.github/workflows/release_wallet_android.yml
@@ -39,6 +39,14 @@ jobs:
     
     # Install Flutter and Dependencies
     - uses: ./.github/actions/dependencies
+
+    - name: Add Secrets file
+      working-directory: example/wallet/android
+      run: touch secrets.properties && echo "${{ secrets.SECRETS_FILE }}" >> secrets.properties
+
+    - name: Add Keystore file
+      working-directory: example/wallet/android
+      run: echo ${{ secrets.KEYSTORE }} | base64 --decode >> app/debug.keystore
     
     # Fastlane
     - name: Fastlane
diff --git a/.github/workflows/release_wallet_android_internal.yml b/.github/workflows/release_wallet_android_internal.yml
index e5a4b063..42f41653 100644
--- a/.github/workflows/release_wallet_android_internal.yml
+++ b/.github/workflows/release_wallet_android_internal.yml
@@ -38,6 +38,14 @@ jobs:
     
     # Install Flutter and Dependencies
     - uses: ./.github/actions/dependencies
+
+    - name: Add Secrets file
+      working-directory: example/wallet/android
+      run: touch secrets.properties && echo "${{ secrets.SECRETS_FILE }}" >> secrets.properties
+
+    - name: Add Keystore file
+      working-directory: example/wallet/android
+      run: echo ${{ secrets.KEYSTORE }} | base64 --decode >> app/debug.keystore
     
     # Fastlane
     - name: Fastlane
diff --git a/.gitignore b/.gitignore
index de3a30be..354a615e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,9 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 
+**/secrets.properties
+**/*.keystore
+
 # fvm
 .fvm/
 
diff --git a/example/dapp/android/app/build.gradle b/example/dapp/android/app/build.gradle
index 525e2132..a3e5e84a 100644
--- a/example/dapp/android/app/build.gradle
+++ b/example/dapp/android/app/build.gradle
@@ -74,6 +74,15 @@ android {
         }
     }
 
+    signingConfigs {
+        debug {
+            storeFile file(secretsProperties['WC_FILENAME'])
+            storePassword secretsProperties['WC_STORE_PASSWORD']
+            keyAlias secretsProperties['WC_KEYSTORE_ALIAS']
+            keyPassword secretsProperties['WC_KEY_PASSWORD']
+        }
+    }
+    
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
diff --git a/example/wallet/android/app/build.gradle b/example/wallet/android/app/build.gradle
index 91bef98c..fa2c4ecd 100644
--- a/example/wallet/android/app/build.gradle
+++ b/example/wallet/android/app/build.gradle
@@ -75,6 +75,15 @@ android {
         }
     }
 
+    signingConfigs {
+        debug {
+            storeFile file(secretsProperties['WC_FILENAME'])
+            storePassword secretsProperties['WC_STORE_PASSWORD']
+            keyAlias secretsProperties['WC_KEYSTORE_ALIAS']
+            keyPassword secretsProperties['WC_KEY_PASSWORD']
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.

From 024a0814f9e033e856e58e683624b94db652d773 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 27 Aug 2024 19:17:51 +0200
Subject: [PATCH 16/22] added keystore secrets

---
 example/dapp/android/app/build.gradle   | 3 +++
 example/wallet/android/app/build.gradle | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/example/dapp/android/app/build.gradle b/example/dapp/android/app/build.gradle
index a3e5e84a..e2f89239 100644
--- a/example/dapp/android/app/build.gradle
+++ b/example/dapp/android/app/build.gradle
@@ -74,6 +74,9 @@ android {
         }
     }
 
+    def secretsProperties = new Properties()
+    secretsProperties.load(new FileInputStream(rootProject.file("secrets.properties")))
+    
     signingConfigs {
         debug {
             storeFile file(secretsProperties['WC_FILENAME'])
diff --git a/example/wallet/android/app/build.gradle b/example/wallet/android/app/build.gradle
index fa2c4ecd..ae61cb21 100644
--- a/example/wallet/android/app/build.gradle
+++ b/example/wallet/android/app/build.gradle
@@ -75,6 +75,9 @@ android {
         }
     }
 
+    def secretsProperties = new Properties()
+    secretsProperties.load(new FileInputStream(rootProject.file("secrets.properties")))
+
     signingConfigs {
         debug {
             storeFile file(secretsProperties['WC_FILENAME'])

From f7daee437dd0b5a0b703f8ebac506fdd5ee9e3fd Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 30 Aug 2024 11:10:36 +0200
Subject: [PATCH 17/22] fix link mode on cold boot

---
 example/dapp/ios/Runner/AppDelegate.swift     | 12 +--
 example/dapp/lib/main.dart                    | 23 +++---
 example/dapp/lib/pages/connect_page.dart      | 77 ++++++-------------
 example/dapp/lib/utils/sample_wallets.dart    | 76 +++++++++++-------
 example/wallet/ios/Runner/AppDelegate.swift   | 11 +--
 .../lib/dependencies/web3wallet_service.dart  | 23 +++---
 example/wallet/lib/pages/settings_page.dart   | 23 ------
 lib/apis/sign_api/sign_engine.dart            |  2 +-
 8 files changed, 103 insertions(+), 144 deletions(-)

diff --git a/example/dapp/ios/Runner/AppDelegate.swift b/example/dapp/ios/Runner/AppDelegate.swift
index 31be96ee..db0e4c4c 100644
--- a/example/dapp/ios/Runner/AppDelegate.swift
+++ b/example/dapp/ios/Runner/AppDelegate.swift
@@ -22,10 +22,11 @@ import Flutter
         
         methodsChannel = FlutterMethodChannel(name: AppDelegate.METHODS_CHANNEL, binaryMessenger: controller.binaryMessenger)
         methodsChannel?.setMethodCallHandler({ [weak self] (call: FlutterMethodCall, result: FlutterResult) -> Void in
-            if (call.method == "initialLink") {
+           if (call.method == "initialLink") {
                 if let link = self?.initialLink {
                     self?.initialLink = nil
-                    result(link)
+                    let _ = self?.linkStreamHandler.handleLink(link)
+                    return
                 } else {
                     result("")
                 }
@@ -46,10 +47,9 @@ import Flutter
     
     override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
         // Handle universal links
-        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
-            if let url = userActivity.webpageURL {
-                return linkStreamHandler.handleLink(url.absoluteString)
-            }
+        if let url = userActivity.webpageURL {
+            self.initialLink = url.absoluteString
+            return linkStreamHandler.handleLink(self.initialLink!)
         }
         return false
     }
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index 30fe9abf..bcd564f6 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -67,24 +67,21 @@ class _MyHomePageState extends State<MyHomePage> {
     return flavor.replaceAll('-production', '');
   }
 
-  String _universalLink(bool fromMR) {
-    Uri link = fromMR
-        ? Uri.parse(
-            'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_appkit')
-        : Uri.parse('https://lab.web3modal.com/flutter_appkit');
+  String _universalLink() {
+    Uri link = Uri.parse('https://lab.web3modal.com/flutter_appkit');
     if (_flavor.isNotEmpty) {
-      if (!fromMR) {
-        link = link.replace(host: 'dev.${link.host}');
-      }
-      return link.replace(path: '${link.path}_internal').toString();
+      return link
+          .replace(path: '${link.path}_internal')
+          .replace(host: 'dev.${link.host}')
+          .toString();
     }
     return link.toString();
   }
 
-  Redirect _constructRedirect(bool fromMR) {
+  Redirect _constructRedirect() {
     return Redirect(
       native: 'wcflutterdapp$_flavor://',
-      universal: _universalLink(fromMR),
+      universal: _universalLink(),
       // enable linkMode on Wallet so Dapps can use relay-less connection
       // universal: value must be set on cloud config as well
       linkMode: true,
@@ -92,8 +89,6 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<void> initialize() async {
-    final prefs = await SharedPreferences.getInstance();
-    final fromMR = prefs.getBool('_LM_from_MR') ?? true;
     _web3App = Web3App(
       core: Core(
         projectId: DartDefines.projectId,
@@ -106,7 +101,7 @@ class _MyHomePageState extends State<MyHomePage> {
         icons: [
           'https://images.prismic.io/wallet-connect/65785a56531ac2845a260732_WalletConnect-App-Logo-1024X1024.png'
         ],
-        redirect: _constructRedirect(fromMR),
+        redirect: _constructRedirect(),
       ),
     );
 
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index f7b53dab..17ca2429 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -2,7 +2,6 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/foundation.dart';
@@ -36,7 +35,6 @@ class ConnectPage extends StatefulWidget {
 
 class ConnectPageState extends State<ConnectPage> {
   bool _testnetOnly = false;
-  bool _testFromMR = true;
   final List<ChainMetadata> _selectedChains = [];
   bool _shouldDismissQrCode = true;
   bool _initialized = false;
@@ -55,9 +53,6 @@ class ConnectPageState extends State<ConnectPage> {
 
     await _walletConnectModalService.init();
 
-    final prefs = await SharedPreferences.getInstance();
-    _testFromMR = prefs.getBool('_LM_from_MR') ?? true;
-
     setState(() => _initialized = true);
 
     widget.web3App.onSessionConnect.subscribe(_onSessionConnect);
@@ -186,39 +181,23 @@ class ConnectPageState extends State<ConnectPage> {
           textAlign: TextAlign.center,
         ),
         const SizedBox(height: StyleConstants.linear8),
-        SizedBox(
-          height: StyleConstants.linear48,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              const Text(
-                StringConstants.testnetsOnly,
-                style: StyleConstants.buttonText,
-              ),
-              Switch(
-                value: _testnetOnly,
-                onChanged: (value) {
-                  setState(() {
-                    _selectedChains.clear();
-                    _testnetOnly = value;
-                  });
-                },
-              ),
-              const Expanded(child: SizedBox()),
-              const Text(
-                'LM from MR',
-                style: StyleConstants.buttonText,
-              ),
-              Switch(
-                value: _testFromMR,
-                onChanged: (value) async {
-                  final prefs = await SharedPreferences.getInstance();
-                  await prefs.setBool('_LM_from_MR', value);
-                  exit(0);
-                },
-              ),
-            ],
-          ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Text(
+              StringConstants.testnetsOnly,
+              style: StyleConstants.buttonText,
+            ),
+            Switch(
+              value: _testnetOnly,
+              onChanged: (value) {
+                setState(() {
+                  _selectedChains.clear();
+                  _testnetOnly = value;
+                });
+              },
+            ),
+          ],
         ),
         const Text('EVM Chains:', style: StyleConstants.buttonText),
         const SizedBox(height: StyleConstants.linear8),
@@ -261,13 +240,10 @@ class ConnectPageState extends State<ConnectPage> {
               style: StyleConstants.buttonText,
             ),
             const SizedBox(height: StyleConstants.linear8),
-            Wrap(
-              spacing: 8.0,
-              runSpacing: 8.0,
-              children:
-                  WCSampleWallets.getSampleWallets(_testFromMR).map((wallet) {
-                return SizedBox(
-                  width: (MediaQuery.of(context).size.width / 2) - 16,
+            Column(
+              children: WCSampleWallets.getSampleWallets().map((wallet) {
+                return Padding(
+                  padding: const EdgeInsets.only(bottom: 8.0),
                   child: ElevatedButton(
                     style: _buttonStyle,
                     onPressed: _selectedChains.isEmpty
@@ -303,13 +279,10 @@ class ConnectPageState extends State<ConnectPage> {
               style: StyleConstants.buttonText,
             ),
             const SizedBox(height: StyleConstants.linear8),
-            Wrap(
-              spacing: 8.0,
-              runSpacing: 8.0,
-              children:
-                  WCSampleWallets.getSampleWallets(_testFromMR).map((wallet) {
-                return SizedBox(
-                  width: (MediaQuery.of(context).size.width / 2) - 16,
+            Column(
+              children: WCSampleWallets.getSampleWallets().map((wallet) {
+                return Padding(
+                  padding: const EdgeInsets.only(bottom: 8.0),
                   child: ElevatedButton(
                     style: _buttonStyle,
                     onPressed: _selectedChains.isEmpty
diff --git a/example/dapp/lib/utils/sample_wallets.dart b/example/dapp/lib/utils/sample_wallets.dart
index 8f7ce16d..e7730c6a 100644
--- a/example/dapp/lib/utils/sample_wallets.dart
+++ b/example/dapp/lib/utils/sample_wallets.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 class WCSampleWallets {
-  static List<Map<String, dynamic>> sampleWallets(bool mr) => [
+  static List<Map<String, dynamic>> sampleWalletsInternal() => [
         {
           'name': 'Swift Wallet',
           'platform': ['ios'],
@@ -10,38 +10,57 @@ class WCSampleWallets {
           'bundleId': 'com.walletconnect.sample.wallet',
           'universal': 'https://lab.web3modal.com/wallet',
         },
-        {
-          'name': 'Flutter Wallet',
-          'platform': ['ios', 'android'],
-          'id': '123456789012345678901234567891',
-          'schema': 'wcflutterwallet://',
-          'bundleId': 'com.walletconnect.flutterwallet',
-          'universal': 'https://lab.web3modal.com/flutter_walletkit',
-        },
         {
           'name': 'Flutter Wallet (internal)',
           'platform': ['ios', 'android'],
           'id': '123456789012345678901234567895',
           'schema': 'wcflutterwallet-internal://',
           'bundleId': 'com.walletconnect.flutterwallet.internal',
-          'universal': mr
-              ? 'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_walletkit_internal'
-              : 'https://dev.lab.web3modal.com/flutter_walletkit_internal',
+          'universal':
+              'https://dev.lab.web3modal.com/flutter_walletkit_internal',
         },
         {
-          'name': 'RN Wallet',
+          'name': 'RN Wallet (internal)',
           'platform': ['ios', 'android'],
-          'id': '123456789012345678901234567892',
+          'id': '1234567890123456789012345678922',
           'schema': 'rn-web3wallet://wc',
-          'bundleId': 'com.walletconnect.web3wallet.rnsample',
+          'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
           'universal': 'https://lab.web3modal.com/rn_walletkit',
         },
         {
-          'name': 'RN Wallet (internal)',
+          'name': 'Kotlin Wallet (Internal)',
+          'platform': ['android'],
+          'id': '123456789012345678901234567894',
+          'schema': 'kotlin-web3wallet://wc',
+          'bundleId': 'com.walletconnect.sample.wallet.internal',
+          'universal':
+              'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
+        },
+      ];
+
+  static List<Map<String, dynamic>> sampleWalletsProduction() => [
+        {
+          'name': 'Swift Wallet',
+          'platform': ['ios'],
+          'id': '123456789012345678901234567890',
+          'schema': 'walletapp://',
+          'bundleId': 'com.walletconnect.sample.wallet',
+          'universal': 'https://lab.web3modal.com/wallet',
+        },
+        {
+          'name': 'Flutter Wallet',
           'platform': ['ios', 'android'],
-          'id': '1234567890123456789012345678922',
+          'id': '123456789012345678901234567891',
+          'schema': 'wcflutterwallet://',
+          'bundleId': 'com.walletconnect.flutterwallet',
+          'universal': 'https://lab.web3modal.com/flutter_walletkit',
+        },
+        {
+          'name': 'RN Wallet',
+          'platform': ['ios', 'android'],
+          'id': '123456789012345678901234567892',
           'schema': 'rn-web3wallet://wc',
-          'bundleId': 'com.walletconnect.web3wallet.rnsample.internal',
+          'bundleId': 'com.walletconnect.web3wallet.rnsample',
           'universal': 'https://lab.web3modal.com/rn_walletkit',
         },
         {
@@ -53,19 +72,18 @@ class WCSampleWallets {
           'universal':
               'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release',
         },
-        {
-          'name': 'Kotlin Wallet (Internal)',
-          'platform': ['android'],
-          'id': '123456789012345678901234567894',
-          'schema': 'kotlin-web3wallet://wc',
-          'bundleId': 'com.walletconnect.sample.wallet.internal',
-          'universal':
-              'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal',
-        },
       ];
 
-  static List<Map<String, dynamic>> getSampleWallets(bool mr) {
-    return sampleWallets(mr).where((e) {
+  static List<Map<String, dynamic>> getSampleWallets() {
+    String flavor = '-${const String.fromEnvironment('FLUTTER_APP_FLAVOR')}';
+    flavor = flavor.replaceAll('-production', '');
+    if (flavor.isNotEmpty) {
+      return sampleWalletsInternal().where((e) {
+        return (e['platform'] as List<String>)
+            .contains(Platform.operatingSystem);
+      }).toList();
+    }
+    return sampleWalletsProduction().where((e) {
       return (e['platform'] as List<String>).contains(Platform.operatingSystem);
     }).toList();
   }
diff --git a/example/wallet/ios/Runner/AppDelegate.swift b/example/wallet/ios/Runner/AppDelegate.swift
index 641708da..c8c71051 100644
--- a/example/wallet/ios/Runner/AppDelegate.swift
+++ b/example/wallet/ios/Runner/AppDelegate.swift
@@ -25,7 +25,8 @@ import Flutter
             if (call.method == "initialLink") {
                 if let link = self?.initialLink {
                     self?.initialLink = nil
-                    result(link)
+                    let _ = self?.linkStreamHandler.handleLink(link)
+                    return
                 } else {
                     result("")
                 }
@@ -46,13 +47,13 @@ import Flutter
     
     override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
         // Handle universal links
-        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
-            if let url = userActivity.webpageURL {
-                return linkStreamHandler.handleLink(url.absoluteString)
-            }
+        if let url = userActivity.webpageURL {
+            self.initialLink = url.absoluteString
+            return linkStreamHandler.handleLink(self.initialLink!)
         }
         return false
     }
+
 }
 
 class LinkStreamHandler: NSObject, FlutterStreamHandler {
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index 4a382f2e..aedf6829 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -28,24 +28,21 @@ class Web3WalletService extends IWeb3WalletService {
     return flavor.replaceAll('-production', '');
   }
 
-  String _universalLink(fromMR) {
-    Uri link = fromMR
-        ? Uri.parse(
-            'https://web3modal-laboratory-git-chores-addedmore-3e0f2b-walletconnect1.vercel.app/flutter_walletkit')
-        : Uri.parse('https://lab.web3modal.com/flutter_walletkit');
+  String _universalLink() {
+    Uri link = Uri.parse('https://lab.web3modal.com/flutter_walletkit');
     if (_flavor.isNotEmpty) {
-      if (!fromMR) {
-        link = link.replace(host: 'dev.${link.host}');
-      }
-      return link.replace(path: '${link.path}_internal').toString();
+      return link
+          .replace(path: '${link.path}_internal')
+          .replace(host: 'dev.${link.host}')
+          .toString();
     }
     return link.toString();
   }
 
-  Redirect _constructRedirect(bool fromMR) {
+  Redirect _constructRedirect() {
     return Redirect(
       native: 'wcflutterwallet$_flavor://',
-      universal: _universalLink(fromMR),
+      universal: _universalLink(),
       // enable linkMode on Wallet so Dapps can use relay-less connection
       // universal: value must be set on cloud config as well
       linkMode: true,
@@ -54,8 +51,6 @@ class Web3WalletService extends IWeb3WalletService {
 
   @override
   Future<void> create() async {
-    final prefs = await SharedPreferences.getInstance();
-    final fromMR = prefs.getBool('_LM_from_MR') ?? true;
     // Create the web3wallet
     _web3Wallet = Web3Wallet(
       core: Core(
@@ -69,7 +64,7 @@ class Web3WalletService extends IWeb3WalletService {
         icons: [
           'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png'
         ],
-        redirect: _constructRedirect(fromMR),
+        redirect: _constructRedirect(),
       ),
     );
 
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index fb76297c..8898a883 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -1,6 +1,5 @@
 // ignore_for_file: use_build_context_synchronously
 
-import 'dart:io';
 import 'dart:math';
 import 'dart:ui';
 
@@ -77,28 +76,6 @@ class _SettingsPageState extends State<SettingsPage> {
                 _Metadata(),
                 const SizedBox(height: 20.0),
                 const Divider(height: 1.0),
-                FutureBuilder<SharedPreferences>(
-                  future: SharedPreferences.getInstance(),
-                  builder: (context, snapshot) {
-                    if (!snapshot.hasData) {
-                      return const SizedBox.shrink();
-                    }
-                    final prefs = snapshot.data as SharedPreferences;
-                    return Row(
-                      children: [
-                        const SizedBox(width: 20.0),
-                        const Text('LM from MR '),
-                        Switch(
-                          value: prefs.getBool('_LM_from_MR') ?? true,
-                          onChanged: (value) async {
-                            await prefs.setBool('_LM_from_MR', value);
-                            exit(0);
-                          },
-                        ),
-                      ],
-                    );
-                  },
-                ),
                 _Buttons(
                   onRestoreFromSeed: () async {
                     final mnemonic =
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index d157f227..bb533065 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -2296,7 +2296,7 @@ class SignEngine implements ISignEngine {
         metadata: metadata,
       ),
       expiryTimestamp: expiryTimestamp.millisecondsSinceEpoch,
-      transportType: transportType, // TODO LinkMode remove? Ask Nacho or Gancho
+      // transportType: transportType, // TODO LinkMode remove? Ask Nacho or Gancho
     );
 
     // Set the one time use receiver public key for decoding the Type 1 envelope

From 6cf8ff402a3311a3b1f1cfdb335ab4cf9a6e87cb Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Sat, 31 Aug 2024 11:00:25 +0200
Subject: [PATCH 18/22] rollback change

---
 lib/apis/sign_api/sign_engine.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index bb533065..d157f227 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -2296,7 +2296,7 @@ class SignEngine implements ISignEngine {
         metadata: metadata,
       ),
       expiryTimestamp: expiryTimestamp.millisecondsSinceEpoch,
-      // transportType: transportType, // TODO LinkMode remove? Ask Nacho or Gancho
+      transportType: transportType, // TODO LinkMode remove? Ask Nacho or Gancho
     );
 
     // Set the one time use receiver public key for decoding the Type 1 envelope

From 1bef4d1fdea0dae94cf38232b73eaa6a50f4e1db Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 2 Sep 2024 11:14:35 +0200
Subject: [PATCH 19/22] fixed tests

---
 test/sign_api/utils/sign_client_test_wrapper.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/sign_api/utils/sign_client_test_wrapper.dart b/test/sign_api/utils/sign_client_test_wrapper.dart
index d4b7414b..5337942f 100644
--- a/test/sign_api/utils/sign_client_test_wrapper.dart
+++ b/test/sign_api/utils/sign_client_test_wrapper.dart
@@ -571,6 +571,7 @@ class SignClientTestWrapper implements ISignEngine {
     try {
       return await client.authenticate(
         params: params,
+        walletUniversalLink: walletUniversalLink,
         pairingTopic: pairingTopic,
         methods: methods,
       );

From b2f0f8c20e1192ada96e58bd18d17e8ab5d57b74 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 3 Sep 2024 14:04:36 +0200
Subject: [PATCH 20/22] addressed bug bash feedback

---
 example/dapp/ios/Runner/AppDelegate.swift     |  36 ++--
 example/dapp/ios/fastlane/Fastfile            |   2 -
 example/dapp/lib/main.dart                    |   2 +-
 example/dapp/lib/utils/deep_link_handler.dart |   7 +-
 example/wallet/ios/Runner/AppDelegate.swift   |  35 ++--
 example/wallet/ios/fastlane/Fastfile          |   2 -
 .../chain_services/evm_service.dart           |   8 +
 .../lib/dependencies/deep_link_handler.dart   |   7 +-
 .../key_service/i_key_service.dart            |   4 +
 .../dependencies/key_service/key_service.dart |  22 ++-
 .../lib/dependencies/web3wallet_service.dart  |   7 +-
 example/wallet/lib/pages/apps_page.dart       |   2 +-
 example/wallet/lib/pages/settings_page.dart   |   7 +-
 example/wallet/lib/utils/methods_utils.dart   |   8 +-
 .../wc_connection_request_widget.dart         |   5 +-
 .../wc_request_widget.dart                    |   7 +
 lib/apis/core/connectivity/connectivity.dart  |  17 +-
 lib/apis/core/relay_client/relay_client.dart  |   4 +
 lib/apis/core/verify/i_verify.dart            |   5 +
 lib/apis/core/verify/verify.dart              |  19 +++
 lib/apis/sign_api/sign_engine.dart            | 155 ++++++++++++------
 21 files changed, 253 insertions(+), 108 deletions(-)

diff --git a/example/dapp/ios/Runner/AppDelegate.swift b/example/dapp/ios/Runner/AppDelegate.swift
index db0e4c4c..805d27d2 100644
--- a/example/dapp/ios/Runner/AppDelegate.swift
+++ b/example/dapp/ios/Runner/AppDelegate.swift
@@ -22,13 +22,12 @@ import Flutter
         
         methodsChannel = FlutterMethodChannel(name: AppDelegate.METHODS_CHANNEL, binaryMessenger: controller.binaryMessenger)
         methodsChannel?.setMethodCallHandler({ [weak self] (call: FlutterMethodCall, result: FlutterResult) -> Void in
-           if (call.method == "initialLink") {
+            if (call.method == "initialLink") {
                 if let link = self?.initialLink {
-                    self?.initialLink = nil
-                    let _ = self?.linkStreamHandler.handleLink(link)
-                    return
-                } else {
-                    result("")
+                    let handled = self?.linkStreamHandler.handleLink(link)
+                    if (handled == true) {
+                        self?.initialLink = nil
+                    }
                 }
             }
         })
@@ -37,6 +36,13 @@ import Flutter
         if let url = launchOptions?[.url] as? URL {
             self.initialLink = url.absoluteString
         }
+
+        if let userActivityDictionary = launchOptions?[.userActivityDictionary] as? [String: Any],
+           let userActivity = userActivityDictionary["UIApplicationLaunchOptionsUserActivityKey"] as? NSUserActivity,
+           userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            
+            handleIncomingUniversalLink(userActivity: userActivity)
+        }
         
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
@@ -46,13 +52,23 @@ import Flutter
     }
     
     override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
-        // Handle universal links
-        if let url = userActivity.webpageURL {
-            self.initialLink = url.absoluteString
-            return linkStreamHandler.handleLink(self.initialLink!)
+        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            handleIncomingUniversalLink(userActivity: userActivity)
+            return true
         }
         return false
     }
+    
+    private func handleIncomingUniversalLink(userActivity: NSUserActivity) {
+        if let url = userActivity.webpageURL {
+            // Handle the URL, navigate to appropriate screen
+            print("App launched with Universal Link: \(url.absoluteString)")
+            let handled = linkStreamHandler.handleLink(url.absoluteString)
+            if (!handled){
+                self.initialLink = url.absoluteString
+            }
+        }
+    }
 }
 
 class LinkStreamHandler: NSObject, FlutterStreamHandler {
diff --git a/example/dapp/ios/fastlane/Fastfile b/example/dapp/ios/fastlane/Fastfile
index 8088a5f2..ed18ff18 100644
--- a/example/dapp/ios/fastlane/Fastfile
+++ b/example/dapp/ios/fastlane/Fastfile
@@ -114,8 +114,6 @@ platform :ios do
       changelog: changelog,
       distribute_external: true,
       notify_external_testers: true,
-      distribute_external: true,
-      notify_external_testers: true,
       skip_waiting_for_build_processing: false,
       groups: ["External Testers"]
     )
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index bcd564f6..47b74c4a 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -97,7 +97,7 @@ class _MyHomePageState extends State<MyHomePage> {
       metadata: PairingMetadata(
         name: 'Sample dApp Flutter',
         description: 'WalletConnect\'s sample dapp with Flutter',
-        url: 'https://walletconnect.com/',
+        url: _universalLink(),
         icons: [
           'https://images.prismic.io/wallet-connect/65785a56531ac2845a260732_WalletConnect-App-Logo-1024X1024.png'
         ],
diff --git a/example/dapp/lib/utils/deep_link_handler.dart b/example/dapp/lib/utils/deep_link_handler.dart
index 80d1a64c..f3c6960c 100644
--- a/example/dapp/lib/utils/deep_link_handler.dart
+++ b/example/dapp/lib/utils/deep_link_handler.dart
@@ -29,13 +29,10 @@ class DeepLinkHandler {
     _web3app = web3app;
   }
 
-  static void checkInitialLink() {
+  static void checkInitialLink() async {
     if (kIsWeb) return;
     try {
-      _methodChannel.invokeMethod('initialLink').then(
-            _onLink,
-            onError: _onError,
-          );
+      _methodChannel.invokeMethod('initialLink');
     } catch (e) {
       debugPrint('[SampleWallet] [DeepLinkHandler] checkInitialLink $e');
     }
diff --git a/example/wallet/ios/Runner/AppDelegate.swift b/example/wallet/ios/Runner/AppDelegate.swift
index c8c71051..68880815 100644
--- a/example/wallet/ios/Runner/AppDelegate.swift
+++ b/example/wallet/ios/Runner/AppDelegate.swift
@@ -24,11 +24,10 @@ import Flutter
         methodsChannel?.setMethodCallHandler({ [weak self] (call: FlutterMethodCall, result: FlutterResult) -> Void in
             if (call.method == "initialLink") {
                 if let link = self?.initialLink {
-                    self?.initialLink = nil
-                    let _ = self?.linkStreamHandler.handleLink(link)
-                    return
-                } else {
-                    result("")
+                    let handled = self?.linkStreamHandler.handleLink(link)
+                    if (handled == true) {
+                        self?.initialLink = nil
+                    }
                 }
             }
         })
@@ -38,6 +37,13 @@ import Flutter
             self.initialLink = url.absoluteString
         }
         
+        if let userActivityDictionary = launchOptions?[.userActivityDictionary] as? [String: Any],
+           let userActivity = userActivityDictionary["UIApplicationLaunchOptionsUserActivityKey"] as? NSUserActivity,
+           userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            
+            handleIncomingUniversalLink(userActivity: userActivity)
+        }
+        
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
     
@@ -46,14 +52,23 @@ import Flutter
     }
     
     override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
-        // Handle universal links
-        if let url = userActivity.webpageURL {
-            self.initialLink = url.absoluteString
-            return linkStreamHandler.handleLink(self.initialLink!)
+        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            handleIncomingUniversalLink(userActivity: userActivity)
+            return true
         }
         return false
     }
-
+    
+    private func handleIncomingUniversalLink(userActivity: NSUserActivity) {
+        if let url = userActivity.webpageURL {
+            // Handle the URL, navigate to appropriate screen
+            print("App launched with Universal Link: \(url.absoluteString)")
+            let handled = linkStreamHandler.handleLink(url.absoluteString)
+            if (!handled){
+                self.initialLink = url.absoluteString
+            }
+        }
+    }
 }
 
 class LinkStreamHandler: NSObject, FlutterStreamHandler {
diff --git a/example/wallet/ios/fastlane/Fastfile b/example/wallet/ios/fastlane/Fastfile
index 1c626f22..a421af47 100644
--- a/example/wallet/ios/fastlane/Fastfile
+++ b/example/wallet/ios/fastlane/Fastfile
@@ -113,8 +113,6 @@ platform :ios do
       changelog: changelog,
       distribute_external: true,
       notify_external_testers: true,
-      distribute_external: true,
-      notify_external_testers: true,
       skip_waiting_for_build_processing: false,
       groups: ["External Testers"]
     )
diff --git a/example/wallet/lib/dependencies/chain_services/evm_service.dart b/example/wallet/lib/dependencies/chain_services/evm_service.dart
index 7b20c068..1af27a69 100644
--- a/example/wallet/lib/dependencies/chain_services/evm_service.dart
+++ b/example/wallet/lib/dependencies/chain_services/evm_service.dart
@@ -107,6 +107,7 @@ class EVMService {
       chainId: pRequest.chainId,
       address: address,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     )) {
       try {
         // Load the private key
@@ -152,6 +153,7 @@ class EVMService {
     if (await MethodsUtils.requestApproval(
       message,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     )) {
       try {
         // Load the private key
@@ -196,6 +198,7 @@ class EVMService {
     if (await MethodsUtils.requestApproval(
       data,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     )) {
       try {
         final keys = GetIt.I<IKeyService>().getKeysForChain(
@@ -236,6 +239,7 @@ class EVMService {
     if (await MethodsUtils.requestApproval(
       data,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     )) {
       try {
         final keys = GetIt.I<IKeyService>().getKeysForChain(
@@ -281,6 +285,7 @@ class EVMService {
       method: pRequest.method,
       chainId: pRequest.chainId,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     );
     if (transaction is Transaction) {
       try {
@@ -337,6 +342,7 @@ class EVMService {
       method: pRequest.method,
       chainId: pRequest.chainId,
       transportType: pRequest.transportType.name,
+      verifyContext: pRequest.verifyContext,
     );
     if (transaction is Transaction) {
       try {
@@ -446,6 +452,7 @@ class EVMService {
     String? title,
     String? method,
     String? chainId,
+    VerifyContext? verifyContext,
     required String transportType,
   }) async {
     Transaction transaction = tJson.toTransaction();
@@ -480,6 +487,7 @@ class EVMService {
       method: method,
       chainId: chainId,
       transportType: transportType,
+      verifyContext: verifyContext,
       extraModels: [
         WCConnectionModel(
           title: 'Gas price',
diff --git a/example/wallet/lib/dependencies/deep_link_handler.dart b/example/wallet/lib/dependencies/deep_link_handler.dart
index 6ece9809..b736f974 100644
--- a/example/wallet/lib/dependencies/deep_link_handler.dart
+++ b/example/wallet/lib/dependencies/deep_link_handler.dart
@@ -22,13 +22,10 @@ class DeepLinkHandler {
         );
   }
 
-  static void checkInitialLink() {
+  static void checkInitialLink() async {
     if (kIsWeb) return;
     try {
-      _methodChannel.invokeMethod('initialLink').then(
-            _onLink,
-            onError: _onError,
-          );
+      _methodChannel.invokeMethod('initialLink');
     } catch (e) {
       debugPrint('[SampleWallet] [DeepLinkHandler] checkInitialLink $e');
     }
diff --git a/example/wallet/lib/dependencies/key_service/i_key_service.dart b/example/wallet/lib/dependencies/key_service/i_key_service.dart
index 21d813d2..3c77c7c7 100644
--- a/example/wallet/lib/dependencies/key_service/i_key_service.dart
+++ b/example/wallet/lib/dependencies/key_service/i_key_service.dart
@@ -1,6 +1,8 @@
 import 'package:walletconnect_flutter_v2_wallet/dependencies/key_service/chain_key.dart';
 
 abstract class IKeyService {
+  Future<void> clearAll();
+
   /// Returns a list of all the keys.
   Future<List<ChainKey>> loadKeys();
 
@@ -19,5 +21,7 @@ abstract class IKeyService {
 
   Future<void> loadDefaultWallet();
 
+  Future<String> getMnemonic();
+
   Future<void> restoreWalletFromSeed({required String mnemonic});
 }
diff --git a/example/wallet/lib/dependencies/key_service/key_service.dart b/example/wallet/lib/dependencies/key_service/key_service.dart
index 876d5a0a..69c4ef66 100644
--- a/example/wallet/lib/dependencies/key_service/key_service.dart
+++ b/example/wallet/lib/dependencies/key_service/key_service.dart
@@ -16,6 +16,17 @@ import 'package:walletconnect_flutter_v2_wallet/utils/dart_defines.dart';
 class KeyService extends IKeyService {
   List<ChainKey> _keys = [];
 
+  @override
+  Future<void> clearAll() async {
+    final prefs = await SharedPreferences.getInstance();
+    final keys = prefs.getKeys();
+    for (var key in keys) {
+      if (key.startsWith('w3w_')) {
+        await prefs.remove(key);
+      }
+    }
+  }
+
   @override
   Future<List<ChainKey>> loadKeys() async {
     // ⚠️ WARNING: SharedPreferences is not the best way to store your keys! This is just for example purposes!
@@ -44,10 +55,11 @@ class KeyService extends IKeyService {
 
   @override
   List<ChainKey> getKeysForChain(String value) {
+    String namespace = value;
     if (value.contains(':')) {
-      return _keys.where((e) => e.chains.contains(value)).toList();
+      namespace = NamespaceUtils.getNamespaceFromChain(value);
     }
-    return _keys.where((e) => e.namespace == value).toList();
+    return _keys.where((e) => e.namespace == namespace).toList();
   }
 
   @override
@@ -61,6 +73,12 @@ class KeyService extends IKeyService {
     return accounts;
   }
 
+  @override
+  Future<String> getMnemonic() async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString('w3w_mnemonic') ?? '';
+  }
+
   // ** bip39/bip32 - EIP155 **
 
   @override
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index aedf6829..a715f6ee 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -60,7 +60,7 @@ class Web3WalletService extends IWeb3WalletService {
       metadata: PairingMetadata(
         name: 'Flutter Wallet Sample',
         description: 'WalletConnect\'s sample wallet with Flutter',
-        url: 'https://walletconnect.com/',
+        url: _universalLink(),
         icons: [
           'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png'
         ],
@@ -198,6 +198,7 @@ class Web3WalletService extends IWeb3WalletService {
       final proposer = args.params.proposer;
       final result = (await _bottomSheetHandler.queueBottomSheet(
             widget: WCRequestWidget(
+              verifyContext: args.verifyContext,
               child: WCConnectionRequestWidget(
                 proposalData: args.params,
                 verifyContext: args.verifyContext,
@@ -321,8 +322,8 @@ class Web3WalletService extends IWeb3WalletService {
               WCBottomSheetResult.reject;
 
       if (rs != WCBottomSheetResult.reject) {
-        final chainKeys = GetIt.I<IKeyService>().getKeysForChain('eip155:1');
-        final privateKey = '0x${chainKeys[0].privateKey}';
+        final chainKeys = GetIt.I<IKeyService>().getKeysForChain('eip155');
+        final privateKey = '0x${chainKeys.first.privateKey}';
         final credentials = EthPrivateKey.fromHex(privateKey);
         //
         final messageToSign = formattedMessages.length;
diff --git a/example/wallet/lib/pages/apps_page.dart b/example/wallet/lib/pages/apps_page.dart
index 621117c5..0f5fc22e 100644
--- a/example/wallet/lib/pages/apps_page.dart
+++ b/example/wallet/lib/pages/apps_page.dart
@@ -216,7 +216,7 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
       DeepLinkHandler.waiting.value = true;
       await _web3Wallet.pair(uri: Uri.parse(uri!));
     } on WalletConnectError catch (e) {
-      _showErrorDialog('${e.code}: ${e.message}');
+      _showErrorDialog('${e.code}: ${e.message}\n$uri');
     } on TimeoutException catch (_) {
       _showErrorDialog('Time out error. Check your connection.');
     }
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index 8898a883..82d15a57 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -99,6 +99,7 @@ class _SettingsPageState extends State<SettingsPage> {
                     }
                   },
                   onRestoreDefault: () async {
+                    await keysService.clearAll();
                     await keysService.loadDefaultWallet();
                     await keysService.loadKeys();
                     await showDialog(
@@ -307,12 +308,12 @@ class _EVMAccountsState extends State<_EVMAccounts> {
         const SizedBox(height: 20.0),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 12.0),
-          child: FutureBuilder<SharedPreferences>(
-            future: SharedPreferences.getInstance(),
+          child: FutureBuilder<String>(
+            future: keysService.getMnemonic(),
             builder: (context, snapshot) {
               return _DataContainer(
                 title: 'Seed phrase',
-                data: snapshot.data?.getString('w3w_mnemonic') ?? '',
+                data: snapshot.data ?? '',
                 blurred: true,
               );
             },
diff --git a/example/wallet/lib/utils/methods_utils.dart b/example/wallet/lib/utils/methods_utils.dart
index 94159108..c6fbcf35 100644
--- a/example/wallet/lib/utils/methods_utils.dart
+++ b/example/wallet/lib/utils/methods_utils.dart
@@ -20,10 +20,12 @@ class MethodsUtils {
     String? address,
     required String transportType,
     List<WCConnectionModel> extraModels = const [],
+    VerifyContext? verifyContext,
   }) async {
     final bottomSheetService = GetIt.I<IBottomSheetService>();
     final WCBottomSheetResult rs = (await bottomSheetService.queueBottomSheet(
           widget: WCRequestWidget(
+            verifyContext: verifyContext,
             child: WCConnectionWidget(
               title: title ?? 'Approve Request',
               info: [
@@ -55,7 +57,11 @@ class MethodsUtils {
     debugPrint(
         '[SampleWallet] handleRedirect topic: $topic, redirect: $redirect, error: $error');
     openApp(topic, redirect, onFail: (e) {
-      goBackModal(title: 'Error', message: e!.message, success: false);
+      goBackModal(
+        title: 'Error',
+        message: error,
+        success: false,
+      );
     });
   }
 
diff --git a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
index ef292b3a..3739fbfc 100644
--- a/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
+++ b/example/wallet/lib/widgets/wc_connection_request/wc_connection_request_widget.dart
@@ -70,9 +70,8 @@ class WCConnectionRequestWidget extends StatelessWidget {
     final cacaoPayload = CacaoRequestPayload.fromPayloadParams(
       authPayloadParams!,
     );
-    const chain = 'eip155:1';
-    final chainKeys = GetIt.I<IKeyService>().getKeysForChain(chain);
-    final iss = 'did:pkh:$chain:${chainKeys.first.address}';
+    final chainKeys = GetIt.I<IKeyService>().getKeysForChain('eip155');
+    final iss = 'did:pkh:eip155:1:${chainKeys.first.address}';
     final message = web3Wallet.formatAuthMessage(
       iss: iss,
       cacaoPayload: cacaoPayload,
diff --git a/example/wallet/lib/widgets/wc_request_widget.dart/wc_request_widget.dart b/example/wallet/lib/widgets/wc_request_widget.dart/wc_request_widget.dart
index 09b5aee3..962dfaa7 100644
--- a/example/wallet/lib/widgets/wc_request_widget.dart/wc_request_widget.dart
+++ b/example/wallet/lib/widgets/wc_request_widget.dart/wc_request_widget.dart
@@ -1,19 +1,23 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/string_constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/custom_button.dart';
+import 'package:walletconnect_flutter_v2_wallet/widgets/wc_connection_request/wc_connection_request_widget.dart';
 
 class WCRequestWidget extends StatelessWidget {
   const WCRequestWidget({
     super.key,
     required this.child,
+    this.verifyContext,
     this.onAccept,
     this.onReject,
   });
 
   final Widget child;
+  final VerifyContext? verifyContext;
   final VoidCallback? onAccept;
   final VoidCallback? onReject;
 
@@ -22,6 +26,9 @@ class WCRequestWidget extends StatelessWidget {
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
+        VerifyContextWidget(
+          verifyContext: verifyContext,
+        ),
         Flexible(
           child: SingleChildScrollView(
             child: child,
diff --git a/lib/apis/core/connectivity/connectivity.dart b/lib/apis/core/connectivity/connectivity.dart
index d110e48c..f63c2136 100644
--- a/lib/apis/core/connectivity/connectivity.dart
+++ b/lib/apis/core/connectivity/connectivity.dart
@@ -17,8 +17,6 @@ class ConnectivityState implements IConnectivity {
   @override
   Future<void> init() async {
     if (_initialized) return;
-    final result = await Connectivity().checkConnectivity();
-    _updateConnectionStatus(result);
     Connectivity().onConnectivityChanged.listen(
           _updateConnectionStatus,
         );
@@ -26,16 +24,19 @@ class ConnectivityState implements IConnectivity {
   }
 
   Future<void> _updateConnectionStatus(List<ConnectivityResult> result) async {
-    _core.logger.i('[$runtimeType] Connectivity changed $result');
     final isMobileData = result.contains(ConnectivityResult.mobile);
     final isWifi = result.contains(ConnectivityResult.wifi);
+    final isOnlineStatus = isMobileData || isWifi;
 
-    isOnline.value = isMobileData || isWifi;
+    if (isOnline.value != isOnlineStatus) {
+      _core.logger.i('[$runtimeType] Connectivity changed $result');
+      isOnline.value = isOnlineStatus;
 
-    if (isOnline.value && !_core.relayClient.isConnected) {
-      await _core.relayClient.connect();
-    } else if (!isOnline.value && _core.relayClient.isConnected) {
-      await _core.relayClient.disconnect();
+      if (isOnline.value && !_core.relayClient.isConnected) {
+        await _core.relayClient.connect();
+      } else if (!isOnline.value && _core.relayClient.isConnected) {
+        await _core.relayClient.disconnect();
+      }
     }
   }
 }
diff --git a/lib/apis/core/relay_client/relay_client.dart b/lib/apis/core/relay_client/relay_client.dart
index d1afeb6b..8a04eba8 100644
--- a/lib/apis/core/relay_client/relay_client.dart
+++ b/lib/apis/core/relay_client/relay_client.dart
@@ -361,6 +361,10 @@ class RelayClient implements IRelayClient {
   Future<bool> handleLinkModeMessage(String topic, String message) async {
     core.logger.t('[$runtimeType]: handleLinkModeMessage: $topic, $message');
 
+    // if client calls dispatchEnvelope with the same message more than once we do nothing.
+    final recorded = messageTracker.messageIsRecorded(topic, message);
+    if (recorded) return true;
+
     // Record a message event
     await messageTracker.recordMessageEvent(topic, message);
 
diff --git a/lib/apis/core/verify/i_verify.dart b/lib/apis/core/verify/i_verify.dart
index 83d30080..6102fee9 100644
--- a/lib/apis/core/verify/i_verify.dart
+++ b/lib/apis/core/verify/i_verify.dart
@@ -4,4 +4,9 @@ abstract class IVerify {
   Future<void> init({String? verifyUrl});
 
   Future<AttestationResponse?> resolve({required String attestationId});
+
+  Validation getValidation(
+    AttestationResponse? attestation,
+    Uri? metadataUri,
+  );
 }
diff --git a/lib/apis/core/verify/verify.dart b/lib/apis/core/verify/verify.dart
index 4fdc8ea1..82b2d426 100644
--- a/lib/apis/core/verify/verify.dart
+++ b/lib/apis/core/verify/verify.dart
@@ -45,6 +45,25 @@ class Verify implements IVerify {
     }
   }
 
+  @override
+  Validation getValidation(
+    AttestationResponse? attestation,
+    Uri? metadataUri,
+  ) {
+    if (attestation?.isScam == true) {
+      return Validation.SCAM;
+    }
+
+    if ((attestation?.origin ?? '').isEmpty ||
+        (metadataUri?.origin ?? '').isEmpty) {
+      return Validation.INVALID;
+    }
+
+    return attestation!.origin == metadataUri!.origin
+        ? Validation.VALID
+        : Validation.INVALID;
+  }
+
   String _setVerifyUrl({String? verifyUrl}) {
     String url = verifyUrl ?? WalletConnectConstants.VERIFY_SERVER;
 
diff --git a/lib/apis/sign_api/sign_engine.dart b/lib/apis/sign_api/sign_engine.dart
index d157f227..99980a6d 100644
--- a/lib/apis/sign_api/sign_engine.dart
+++ b/lib/apis/sign_api/sign_engine.dart
@@ -371,20 +371,21 @@ class SignEngine implements ISignEngine {
     await _setSessionExpiry(sessionTopic, expiry);
 
     // `wc_sessionSettle` is not critical throughout the entire session.
+    final settleRequest = WcSessionSettleRequest(
+      relay: relay,
+      namespaces: namespaces,
+      sessionProperties: sessionProperties,
+      expiry: expiry,
+      controller: ConnectionMetadata(
+        publicKey: selfPubKey,
+        metadata: metadata,
+      ),
+    );
     bool acknowledged = await core.pairing
         .sendRequest(
           sessionTopic,
           MethodConstants.WC_SESSION_SETTLE,
-          WcSessionSettleRequest(
-            relay: relay,
-            namespaces: namespaces,
-            sessionProperties: sessionProperties,
-            expiry: expiry,
-            controller: ConnectionMetadata(
-              publicKey: selfPubKey,
-              metadata: metadata,
-            ),
-          ),
+          settleRequest.toJson(),
         )
         // Sometimes we don't receive any response for a long time,
         // in which case we manually time out to prevent waiting indefinitely.
@@ -462,10 +463,14 @@ class SignEngine implements ISignEngine {
       namespaces: namespaces,
     );
 
+    final updateRequest = WcSessionUpdateRequest(
+      namespaces: namespaces,
+    );
+
     await core.pairing.sendRequest(
       topic,
       MethodConstants.WC_SESSION_UPDATE,
-      WcSessionUpdateRequest(namespaces: namespaces),
+      updateRequest.toJson(),
     );
   }
 
@@ -523,17 +528,17 @@ class SignEngine implements ISignEngine {
       _confirmOnlineStateOrThrow();
     }
 
+    final sessionRequest = WcSessionRequestRequest(
+      chainId: chainId,
+      request: request,
+      transportType: session?.transportType ?? TransportType.relay,
+    );
+
     return await core.pairing.sendRequest(
       topic,
       MethodConstants.WC_SESSION_REQUEST,
-      WcSessionRequestRequest(
-        chainId: chainId,
-        request: request,
-        transportType: session?.transportType ?? TransportType.relay,
-      ),
-      appLink: isLinkMode ? session?.peer.metadata.redirect?.universal : null,
-      encodeOptions:
-          isLinkMode ? EncodeOptions(type: EncodeOptions.TYPE_2) : null,
+      sessionRequest.toJson(),
+      appLink: _getAppLinkIfEnabled(session?.peer.metadata),
     );
   }
 
@@ -618,9 +623,6 @@ class SignEngine implements ISignEngine {
 
     final appLink = _getAppLinkIfEnabled(session?.peer.metadata);
 
-    final EncodeOptions? encodeOptions =
-        isLinkModeSession ? EncodeOptions(type: EncodeOptions.TYPE_2) : null;
-
     if (response.result != null) {
       await core.pairing.sendResult(
         response.id,
@@ -628,7 +630,6 @@ class SignEngine implements ISignEngine {
         MethodConstants.WC_SESSION_REQUEST,
         response.result,
         appLink: appLink,
-        encodeOptions: encodeOptions,
       );
     } else {
       await core.pairing.sendError(
@@ -637,7 +638,6 @@ class SignEngine implements ISignEngine {
         MethodConstants.WC_SESSION_REQUEST,
         response.error!,
         appLink: appLink,
-        encodeOptions: encodeOptions,
       );
     }
 
@@ -671,13 +671,16 @@ class SignEngine implements ISignEngine {
       event,
       chainId,
     );
+
+    final eventRequest = WcSessionEventRequest(
+      chainId: chainId,
+      event: event,
+    );
+
     await core.pairing.sendRequest(
       topic,
       MethodConstants.WC_SESSION_EVENT,
-      WcSessionEventRequest(
-        chainId: chainId,
-        event: event,
-      ),
+      eventRequest.toJson(),
     );
   }
 
@@ -715,14 +718,15 @@ class SignEngine implements ISignEngine {
       if (sessions.has(topic)) {
         // Send the request to delete the session, we don't care if it fails
         try {
+          final deleteRequest = WcSessionDeleteRequest(
+            code: reason.code,
+            message: reason.message,
+            data: reason.data,
+          );
           core.pairing.sendRequest(
             topic,
             MethodConstants.WC_SESSION_DELETE,
-            WcSessionDeleteRequest(
-              code: reason.code,
-              message: reason.message,
-              data: reason.data,
-            ),
+            deleteRequest.toJson(),
           );
         } catch (_) {}
 
@@ -1133,6 +1137,7 @@ class SignEngine implements ISignEngine {
       final verifyContext = await _getVerifyContext(
         payload,
         proposal.proposer.metadata,
+        TransportType.relay,
       );
 
       onSessionProposal.broadcast(
@@ -1382,6 +1387,7 @@ class SignEngine implements ISignEngine {
       final verifyContext = await _getVerifyContext(
         payload,
         session.peer.metadata,
+        transportType,
       );
 
       final sessionRequest = SessionRequest(
@@ -1884,34 +1890,81 @@ class SignEngine implements ISignEngine {
   Future<VerifyContext> _getVerifyContext(
     JsonRpcRequest payload,
     PairingMetadata proposerMetada,
+    TransportType transportType,
   ) async {
+    if (transportType.isLinkMode) {
+      return await _getVerifyContextLinkMode(payload, proposerMetada);
+    }
+
+    final defaultVerifyUrl = WalletConnectConstants.VERIFY_SERVER;
+    final verifyUrl = proposerMetada.verifyUrl ?? defaultVerifyUrl;
+
+    final metadataUri = Uri.tryParse(proposerMetada.url);
+
     try {
       final jsonStringify = jsonEncode(payload.toJson());
       final hash = core.crypto.getUtils().hashMessage(jsonStringify);
+      final attestation = await core.verify.resolve(attestationId: hash);
 
-      final result = await core.verify.resolve(attestationId: hash);
-      final validation = result?.origin == Uri.parse(proposerMetada.url).origin
-          ? Validation.VALID
-          : Validation.INVALID;
+      final validation = core.verify.getValidation(
+        attestation,
+        metadataUri,
+      );
 
+      final origin = attestation?.origin;
       return VerifyContext(
-        origin: result?.origin ?? proposerMetada.url,
-        verifyUrl: proposerMetada.verifyUrl ?? '',
-        validation: result?.isScam == true ? Validation.SCAM : validation,
-        isScam: result?.isScam,
+        origin: (origin ?? metadataUri?.origin) ?? proposerMetada.url,
+        verifyUrl: verifyUrl,
+        validation: validation,
+        isScam: validation == Validation.SCAM,
       );
     } catch (e, s) {
       if (e is! AttestationNotFound) {
         core.logger.e('[$runtimeType] verify error', error: e, stackTrace: s);
       }
       return VerifyContext(
-        origin: proposerMetada.url,
-        verifyUrl: proposerMetada.verifyUrl ?? '',
+        origin: metadataUri?.origin ?? proposerMetada.url,
+        verifyUrl: verifyUrl,
         validation: Validation.UNKNOWN,
       );
     }
   }
 
+  Future<VerifyContext> _getVerifyContextLinkMode(
+    JsonRpcRequest payload,
+    PairingMetadata requesterMetadata,
+  ) async {
+    final universalLink = requesterMetadata.redirect?.universal ?? '';
+    final domainUrl = requesterMetadata.url;
+
+    if (universalLink.isEmpty || domainUrl.isEmpty) {
+      return VerifyContext(
+        origin: requesterMetadata.url,
+        verifyUrl: WalletConnectConstants.VERIFY_SERVER,
+        validation: Validation.INVALID,
+      );
+    }
+
+    final universalHost = Uri.parse(universalLink).host;
+    final domainHost = Uri.parse(domainUrl).host;
+
+    final matches =
+        universalHost == domainHost || universalHost.endsWith('.$domainHost');
+    if (matches) {
+      return VerifyContext(
+        origin: domainHost,
+        verifyUrl: WalletConnectConstants.VERIFY_SERVER,
+        validation: Validation.VALID,
+      );
+    }
+
+    return VerifyContext(
+      origin: domainHost,
+      verifyUrl: WalletConnectConstants.VERIFY_SERVER,
+      validation: Validation.INVALID,
+    );
+  }
+
   // NEW 1-CA METHOD (Should this be private?)
 
   @override
@@ -2424,8 +2477,6 @@ class SignEngine implements ISignEngine {
         request.toJson(),
         id: id,
         ttl: expiry,
-        encodeOptions:
-            isLinkMode ? EncodeOptions(type: EncodeOptions.TYPE_2) : null,
         appLink: isLinkMode ? walletUniversalLink : null,
         // We don't want to open the appLink in this case as it will be opened by the host app
         openUrl: false,
@@ -2683,9 +2734,7 @@ class SignEngine implements ISignEngine {
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
 
     final encodeOpts = EncodeOptions(
-      type: pendingRequest.transportType.isLinkMode
-          ? EncodeOptions.TYPE_2
-          : EncodeOptions.TYPE_1,
+      type: EncodeOptions.TYPE_1,
       receiverPublicKey: receiverPublicKey,
       senderPublicKey: senderPublicKey,
     );
@@ -2821,9 +2870,7 @@ class SignEngine implements ISignEngine {
     final responseTopic = core.crypto.getUtils().hashKey(receiverPublicKey);
 
     final encodeOpts = EncodeOptions(
-      type: pendingRequest.transportType.isLinkMode
-          ? EncodeOptions.TYPE_2
-          : EncodeOptions.TYPE_1,
+      type: EncodeOptions.TYPE_1,
       receiverPublicKey: receiverPublicKey,
       senderPublicKey: senderPublicKey,
     );
@@ -2925,7 +2972,11 @@ class SignEngine implements ISignEngine {
         sessionAuthRequest.authPayload,
       );
 
-      final verifyContext = await _getVerifyContext(payload, metadata);
+      final verifyContext = await _getVerifyContext(
+        payload,
+        sessionAuthRequest.requester.metadata,
+        transportType,
+      );
 
       sessionAuthRequests.set(
         payload.id.toString(),

From 758a01a49dc552a6da2313788340a2e6dc15d1b7 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 3 Sep 2024 14:20:12 +0200
Subject: [PATCH 21/22] fix

---
 lib/apis/core/connectivity/connectivity.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/apis/core/connectivity/connectivity.dart b/lib/apis/core/connectivity/connectivity.dart
index f63c2136..36100d7a 100644
--- a/lib/apis/core/connectivity/connectivity.dart
+++ b/lib/apis/core/connectivity/connectivity.dart
@@ -17,6 +17,8 @@ class ConnectivityState implements IConnectivity {
   @override
   Future<void> init() async {
     if (_initialized) return;
+    final result = await Connectivity().checkConnectivity();
+    _updateConnectionStatus(result);
     Connectivity().onConnectivityChanged.listen(
           _updateConnectionStatus,
         );

From fd39830f4cb81d75b322a6842a35aa970df629cd Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Tue, 3 Sep 2024 14:57:26 +0200
Subject: [PATCH 22/22] version up

---
 CHANGELOG.md         | 4 ++++
 lib/src/version.dart | 2 +-
 pubspec.yaml         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 936ea0d4..17f98f15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.4.0-beta01
+
+- Link Mode! https://docs.walletconnect.com/walletkit/flutter/link-mode
+
 ## 2.3.1
 
 - Added Connectivity check to core and throw exceptions when internet connection is gone
diff --git a/lib/src/version.dart b/lib/src/version.dart
index ea3a9755..83c0fcc0 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '2.3.1';
+const packageVersion = '2.4.0-beta01';
diff --git a/pubspec.yaml b/pubspec.yaml
index 986a3809..87c9f2f7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: walletconnect_flutter_v2
 description: WalletConnect's official Dart library v2 for WalletKit and AppKit. The communications protocol for web3.
-version: 2.3.1
+version: 2.4.0-beta01
 repository: https://github.com/WalletConnect/WalletConnectFlutterV2
 
 environment: