Updated disconnect to disconnect even if web3App session has expired

Author: Sterling Long

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.10
+
+- Fixed an issue with disconnect not working properly
+
 ## 2.1.9
 
 - Added safe area to modal for phones with notches

lib/constants/constants.dart

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

lib/services/walletconnect_modal/walletconnect_modal_service.dart

@@ -265,7 +265,11 @@ class WalletConnectModalService extends ChangeNotifier
   Future<void> disconnect() async {
     checkInitialized();
 
+    // If we don't have a session, disconnect automatically and notify listeners
     if (_session == null) {
+      _isConnected = false;
+      _address = '';
+      notifyListeners();
       return;
     }
 
@@ -278,6 +282,7 @@ class WalletConnectModalService extends ChangeNotifier
         message: 'User disconnected',
       ),
     );
+    // Disconnecting the session will produce the onSessionDisconnect callback
     await web3App!.disconnectSession(
       topic: session!.topic,
       // ignore: prefer_const_constructors
@@ -286,6 +291,14 @@ class WalletConnectModalService extends ChangeNotifier
         message: 'User disconnected',
       ),
     );
+
+    // As a failsafe (If the session is expired for example), set the session to null and notify listeners
+    if (_session != null) {
+      _isConnected = false;
+      _address = '';
+      _session = null;
+      notifyListeners();
+    }
   }
 
   @override

pubspec.yaml

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

test/walletconnect_modal_service/walletconnect_modal_service_unit_test.dart

@@ -226,6 +226,13 @@ void main() {
 
         await service.init();
 
+        int count = 0;
+        f() {
+          count++;
+        }
+
+        service.addListener(f);
+
         when(
           web3App.disconnectSession(
             topic: anyNamed('topic'),
@@ -235,10 +242,28 @@ void main() {
 
         await service.disconnect();
 
-        verify(web3App.disconnectSession(
-          topic: testSession.topic,
-          reason: anyNamed('reason'),
-        )).called(1);
+        verifyInOrder([
+          web3App.disconnectSession(
+            topic: testSession.pairingTopic,
+            reason: anyNamed('reason'),
+          ),
+          web3App.disconnectSession(
+            topic: testSession.topic,
+            reason: anyNamed('reason'),
+          )
+        ]);
+
+        expect(service.isConnected, isFalse);
+        expect(service.session, isNull);
+        expect(service.address, '');
+        expect(count, 1);
+
+        // Should null things out and notify listeners
+        await service.disconnect();
+
+        expect(count, 2);
+
+        service.removeListener(f);
       });
     });