fixed tests and minor changes

Author: quetool

example/sign/lib/widgets/method_dialog.dart

@@ -48,17 +48,12 @@ class MethodDialogState extends State<MethodDialog> {
           if (snapshot.hasData) {
             final String t = jsonEncode(snapshot.data);
             return InkWell(
-              onTap: () async {
-                await Clipboard.setData(
-                  ClipboardData(
-                    text: t,
-                  ),
-                );
-                showPlatformToast(
-                  child: const Text(
-                    StringConstants.copiedToClipboard,
+              onTap: () {
+                Clipboard.setData(ClipboardData(text: t)).then(
+                  (_) => showPlatformToast(
+                    child: const Text(StringConstants.copiedToClipboard),
+                    context: context,
                   ),
-                  context: context,
                 );
               },
               child: Text(
@@ -69,15 +64,12 @@ class MethodDialogState extends State<MethodDialog> {
             return InkWell(
               onTap: () async {
                 await Clipboard.setData(
-                  ClipboardData(
-                    text: snapshot.data.toString(),
-                  ),
-                );
-                showPlatformToast(
-                  child: const Text(
-                    StringConstants.copiedToClipboard,
+                  ClipboardData(text: snapshot.data.toString()),
+                ).then(
+                  (_) => showPlatformToast(
+                    child: const Text(StringConstants.copiedToClipboard),
+                    context: context,
                   ),
-                  context: context,
                 );
               },
               child: Text(

generate_files.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo ' 🔄 Updating dependencies...'
+flutter pub get
+flutter pub run build_runner build --delete-conflicting-outputs
+
+cd example/sign/
+
+echo ' ⬇️ Getting dependencies...'
+flutter pub get
+flutter pub run build_runner build --delete-conflicting-outputs

lib/pages/qr_code_and_wallet_list_page.dart

@@ -14,9 +14,7 @@ import 'package:walletconnect_modal_flutter/widgets/walletconnect_modal_provider
 
 class QRCodeAndWalletListPage extends StatelessWidget {
   const QRCodeAndWalletListPage()
-      : super(
-          key: WalletConnectModalConstants.qrCodeAndWalletListPageKey,
-        );
+      : super(key: WalletConnectModalConstants.qrCodeAndWalletListPageKey);
 
   @override
   Widget build(BuildContext context) {

lib/pages/qr_code_page.dart

@@ -18,8 +18,7 @@ class QRCodePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final IWalletConnectModalService service =
-        WalletConnectModalProvider.of(context).service;
+    final service = WalletConnectModalProvider.of(context).service;
 
     return WalletConnectModalNavBar(
       title: const WalletConnectModalNavbarTitle(

lib/pages/wallet_list_short_page.dart

@@ -15,9 +15,7 @@ import 'package:walletconnect_modal_flutter/widgets/walletconnect_modal_provider
 
 class WalletListShortPage extends StatelessWidget {
   const WalletListShortPage()
-      : super(
-          key: WalletConnectModalConstants.walletListShortPageKey,
-        );
+      : super(key: WalletConnectModalConstants.walletListShortPageKey);
 
   @override
   Widget build(BuildContext context) {

lib/services/utils/widget_stack/widget_stack.dart

@@ -71,7 +71,7 @@ class WidgetStack extends IWidgetStack {
 
   @override
   void addDefault() {
-    final PlatformType pType = platformUtils.instance.getPlatformType();
+    final pType = platformUtils.instance.getPlatformType();
 
     // Choose the state based on platform
     if (pType == PlatformType.mobile) {

lib/services/walletconnect_modal/i_walletconnect_modal_service.dart

@@ -34,7 +34,7 @@ abstract class IWalletConnectModalService implements ChangeNotifier {
   /// This is only available after the [open] function is called.
   String? get wcUri;
 
-  final Event<EventArgs> onPairingExpire = Event();
+  final Event<EventArgs> onPairingExpireEvent = Event();
 
   Future<void> clearPreviousInactivePairings();
 

lib/services/walletconnect_modal/walletconnect_modal_service.dart

@@ -71,7 +71,7 @@ class WalletConnectModalService extends ChangeNotifier
   Map<String, RequiredNamespace> get optionalNamespaces => _optionalNamespaces;
 
   @override
-  final Event<EventArgs> onPairingExpire = Event();
+  final Event<EventArgs> onPairingExpireEvent = Event();
 
   ConnectResponse? connectResponse;
   Future<SessionData>? get sessionFuture => connectResponse?.session.future;
@@ -139,14 +139,10 @@ class WalletConnectModalService extends ChangeNotifier
     _initError = null;
     try {
       await _web3App!.init();
-    } catch (_) {}
-
-    try {
       await WalletConnectModalServices.init();
+      await clearPreviousInactivePairings();
     } catch (_) {}
 
-    await clearPreviousInactivePairings();
-
     if (_web3App!.sessions.getAll().isNotEmpty) {
       _isConnected = true;
       _session = _web3App!.sessions.getAll().first;
@@ -364,7 +360,7 @@ class WalletConnectModalService extends ChangeNotifier
 
   void _onPairingExpire(PairingEvent? args) async {
     _web3App!.core.pairing.onPairingExpire.unsubscribe(_onPairingExpire);
-    onPairingExpire.broadcast();
+    onPairingExpireEvent.broadcast();
   }
 
   bool _connectingWallet = false;

lib/widgets/qr_code_widget.dart

@@ -3,7 +3,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';
 import 'package:walletconnect_modal_flutter/services/utils/platform/platform_utils_singleton.dart';
 import 'package:walletconnect_modal_flutter/services/walletconnect_modal/i_walletconnect_modal_service.dart';
 import 'package:walletconnect_modal_flutter/widgets/walletconnect_modal_theme.dart';
@@ -31,8 +30,9 @@ class _QRCodeWidgetState extends State<QRCodeWidget> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       widget.service.addListener(_rebuild);
-      widget.service.onPairingExpire.subscribe(_onPairingExpire);
+      widget.service.onPairingExpireEvent.subscribe(_onPairingExpire);
       await widget.service.rebuildConnectionUri();
+      _rebuild();
     });
   }
 
@@ -42,7 +42,7 @@ class _QRCodeWidgetState extends State<QRCodeWidget> {
 
   @override
   void dispose() {
-    widget.service.onPairingExpire.unsubscribe(_onPairingExpire);
+    widget.service.onPairingExpireEvent.unsubscribe(_onPairingExpire);
     widget.service.removeListener(_rebuild);
     widget.service.clearPreviousInactivePairings();
     super.dispose();
@@ -57,8 +57,7 @@ class _QRCodeWidgetState extends State<QRCodeWidget> {
 
   @override
   Widget build(BuildContext context) {
-    WalletConnectModalThemeData themeData =
-        WalletConnectModalTheme.getData(context);
+    final themeData = WalletConnectModalTheme.getData(context);
 
     bool isLongBottomSheet = platformUtils.instance.isLongBottomSheet(
       MediaQuery.of(context).orientation,

test/mock_classes.dart

@@ -1,3 +1,4 @@
+import 'package:walletconnect_flutter_v2/apis/core/pairing/pairing_store.dart';
 import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_modal_flutter/services/explorer/explorer_service.dart';
@@ -9,16 +10,21 @@ import 'package:walletconnect_modal_flutter/walletconnect_modal_flutter.dart';
 import 'package:mockito/annotations.dart';
 import 'package:http/http.dart' as http;
 
-@GenerateMocks([
-  ExplorerService,
-  WalletConnectModalService,
-  UrlUtils,
-  PlatformUtils,
-  ToastUtils,
-  Web3App,
-  Sessions,
-  RelayClient,
-  StorageService,
-  http.Client,
-])
+@GenerateMocks(
+  [
+    ExplorerService,
+    WalletConnectModalService,
+    UrlUtils,
+    PlatformUtils,
+    ToastUtils,
+    Web3App,
+    Sessions,
+    RelayClient,
+    StorageService,
+    http.Client,
+  ],
+  customMocks: [
+    MockSpec<PairingStore>(onMissingStub: OnMissingStub.returnDefault),
+  ],
+)
 class Mocks {}