Rebuild connection URI after pairing expiration

Author: quetool

lib/services/walletconnect_modal/i_walletconnect_modal_service.dart

@@ -1,3 +1,4 @@
+import 'package:event/event.dart';
 import 'package:flutter/material.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_modal_flutter/models/listings.dart';
@@ -33,8 +34,9 @@ abstract class IWalletConnectModalService implements ChangeNotifier {
   /// This is only available after the [open] function is called.
   String? get wcUri;
 
-  /// The service used to fetch wallet listings from the explorer API.
-  // abstract final IExplorerService explorerService;
+  final Event<EventArgs> onPairingExpire = Event();
+
+  Future<void> clearPreviousInactivePairings();
 
   /// Sets up the explorer and the web3App if they already been initialized.
   Future<void> init();
@@ -55,15 +57,11 @@ abstract class IWalletConnectModalService implements ChangeNotifier {
 
   /// Disconnects the session and pairing, if any.
   /// If there is no session, this does nothing.
-  Future<void> disconnect({
-    bool disconnectAllSessions = true,
-  });
+  Future<void> disconnect({bool disconnectAllSessions = true});
 
   Future<void> launchCurrentWallet();
 
-  Future<void> connectWallet({
-    required WalletData walletData,
-  });
+  Future<void> connectWallet({required WalletData walletData});
 
   /// The required namespaces that will be used when connecting to the wallet
   Map<String, RequiredNamespace> get requiredNamespaces;

lib/services/walletconnect_modal/walletconnect_modal_service.dart

@@ -70,6 +70,9 @@ class WalletConnectModalService extends ChangeNotifier
   @override
   Map<String, RequiredNamespace> get optionalNamespaces => _optionalNamespaces;
 
+  @override
+  final Event<EventArgs> onPairingExpire = Event();
+
   ConnectResponse? connectResponse;
   Future<SessionData>? get sessionFuture => connectResponse?.session.future;
   BuildContext? context;
@@ -142,6 +145,8 @@ class WalletConnectModalService extends ChangeNotifier
       await WalletConnectModalServices.init();
     } catch (_) {}
 
+    await clearPreviousInactivePairings();
+
     if (_web3App!.sessions.getAll().isNotEmpty) {
       _isConnected = true;
       _session = _web3App!.sessions.getAll().first;
@@ -155,6 +160,15 @@ class WalletConnectModalService extends ChangeNotifier
     notifyListeners();
   }
 
+  @override
+  Future<void> clearPreviousInactivePairings() async {
+    for (var pairing in _web3App!.pairings.getAll()) {
+      if (!pairing.active) {
+        await _web3App!.core.expirer.expire(pairing.topic);
+      }
+    }
+  }
+
   @override
   // ignore: prefer_void_to_null
   Future<Null> onDispose() async {
@@ -176,12 +190,8 @@ class WalletConnectModalService extends ChangeNotifier
 
     _isOpen = true;
 
-    rebuildConnectionUri();
-
     // Reset the explorer
-    explorerService.instance!.filterList(
-      query: '',
-    );
+    explorerService.instance!.filterList(query: '');
     widgetStack.instance.clear();
 
     this.context = context;
@@ -341,17 +351,22 @@ class WalletConnectModalService extends ChangeNotifier
         }
       }
 
+      _web3App!.core.pairing.onPairingExpire.subscribe(_onPairingExpire);
       connectResponse = await web3App!.connect(
         requiredNamespaces: requiredNamespaces,
         optionalNamespaces: optionalNamespaces,
       );
 
       notifyListeners();
-
       awaitConnectResponse();
     }
   }
 
+  void _onPairingExpire(PairingEvent? args) async {
+    _web3App!.core.pairing.onPairingExpire.unsubscribe(_onPairingExpire);
+    onPairingExpire.broadcast();
+  }
+
   bool _connectingWallet = false;
 
   @override

lib/widgets/qr_code_widget.dart

@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:event/event.dart';
 import 'package:flutter/material.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:walletconnect_modal_flutter/models/walletconnect_modal_theme_data.dart';
@@ -28,32 +29,32 @@ class _QRCodeWidgetState extends State<QRCodeWidget> {
   @override
   void initState() {
     super.initState();
-    // _qrCode = widget.service.wcUri!;
-
-    _initialize();
-
-    // widget.service.addListener(_qrCodeChanged);
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      widget.service.addListener(_rebuild);
+      widget.service.onPairingExpire.subscribe(_onPairingExpire);
+      await widget.service.rebuildConnectionUri();
+    });
   }
 
-  Future<void> _initialize() async {
-    if (_initialized) {
-      return;
-    }
-
+  void _onPairingExpire(EventArgs? args) async {
     await widget.service.rebuildConnectionUri();
+  }
 
+  @override
+  void dispose() {
+    widget.service.onPairingExpire.unsubscribe(_onPairingExpire);
+    widget.service.removeListener(_rebuild);
+    widget.service.clearPreviousInactivePairings();
+    super.dispose();
+  }
+
+  void _rebuild() {
     setState(() {
       _qrCode = widget.service.wcUri!;
       _initialized = true;
     });
   }
 
-  // @override
-  // void dispose() {
-  //   widget.service.removeListener(_qrCodeChanged);
-  //   super.dispose();
-  // }
-
   @override
   Widget build(BuildContext context) {
     WalletConnectModalThemeData themeData =