2.1.0

Author: Sterling Long

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.0
+
+- Added `reconnectRelay` to the WalletConnectModalService to allow for manual reconnection to the relay
+- Updated tests to reflect new changes
+
 ## 2.0.0
 
 - Added setOptionalNamespaces to WalletConnectModalService

example/sign/lib/models/eth/ethereum_transaction.g.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 class WalletConnectModalConstants {
-  static const WALLETCONNECT_MODAL_VERSION = '2.0.0';
+  static const WALLETCONNECT_MODAL_VERSION = '2.1.0';
 
   static const Key helpPageKey = Key('helpPageKey');
   static const Key qrCodePageKey = Key('qrCodePageKey');

lib/constants/constants.dart

@@ -49,6 +49,10 @@ abstract class IWalletConnectModalService implements ChangeNotifier {
   /// Closes the modal.
   void close();
 
+  /// Connects to the relay if not already connected.
+  /// If the relay is already connected, this does nothing.
+  Future<void> reconnectRelay();
+
   /// Disconnects the session and pairing, if any.
   /// If there is no session, this does nothing.
   Future<void> disconnect();

lib/services/walletconnect_modal/i_walletconnect_modal_service.dart

@@ -247,6 +247,13 @@ class WalletConnectModalService extends ChangeNotifier
     }
   }
 
+  @override
+  Future<void> reconnectRelay() async {
+    _checkInitialized();
+
+    await web3App!.core.relayClient.connect();
+  }
+
   @override
   Future<void> disconnect() async {
     _checkInitialized();

lib/services/walletconnect_modal/walletconnect_modal_service.dart

@@ -199,10 +199,7 @@ class _WalletConnectModalConnectState extends State<WalletConnectModalConnect> {
   }
 
   void _reconnect() {
-    widget.service.web3App!.core.relayClient.connect(
-        // relayUrl: WalletConnectConstants.DEFAULT_RELAY_URL,
-        // relayUrl: 'https://test.walletconnect.org',
-        );
+    widget.service.reconnectRelay();
 
     setState(() {
       _state = WalletConnectModalConnectButtonState.reconnecting;

lib/widgets/walletconnect_modal_connect.dart

@@ -1,6 +1,6 @@
 name: walletconnect_modal_flutter
 description: The WalletConnectModal for WalletConnect built using Flutter.
-version: 2.0.0
+version: 2.1.0
 repository: https://github.com/WalletConnect/WalletConnectModalFlutter
 
 environment:

pubspec.yaml

@@ -580,6 +580,15 @@ class MockWalletConnectModalService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
+  _i4.Future<void> reconnectRelay() => (super.noSuchMethod(
+        Invocation.method(
+          #reconnectRelay,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
   _i4.Future<void> disconnect() => (super.noSuchMethod(
         Invocation.method(
           #disconnect,

test/mock_classes.mocks.dart

@@ -127,6 +127,7 @@ void main() {
       when(service.initError).thenReturn(
         const WalletConnectError(code: -1, message: 'Network error'),
       );
+      // when(service.reconnectRelay()).thenAnswer((_) async {});
 
       final GlobalKey key = GlobalKey();
       // late BuildContext context;
@@ -166,7 +167,8 @@ void main() {
 
       // Disabled button after tap
       await tester.tap(find.byKey(key));
-      verifyNoMoreInteractions(service);
+      await tester.pump();
+      verify(service.reconnectRelay()).called(1);
     });
   });
 }

test/walletconnect_modal_connect/walletconnect_modal_connect_ui_test.dart

@@ -47,6 +47,9 @@ void main() {
       when(web3App.onSessionDelete).thenReturn(
         Event<SessionDelete>(),
       );
+      when(web3App.onSessionConnect).thenReturn(
+        Event<SessionConnect>(),
+      );
       when(web3App.init()).thenAnswer((_) async {});
       when(web3App.connect(
         requiredNamespaces: anyNamed('requiredNamespaces'),