Merge pull request #637 from cypherstack/ui-fixes

UI fixes

lib/electrumx_rpc/electrumx.dart

@@ -69,13 +69,18 @@ class ElectrumX {
   List<ElectrumXNode>? failovers;
   int currentFailoverIndex = -1;
 
-  ElectrumX(
+  final Duration connectionTimeoutForSpecialCaseJsonRPCClients;
-      {required String host,
+
-      required int port,
+  ElectrumX({
-      required bool useSSL,
+    required String host,
-      required Prefs prefs,
+    required int port,
-      required List<ElectrumXNode> failovers,
+    required bool useSSL,
-      JsonRPC? client}) {
+    required Prefs prefs,
+    required List<ElectrumXNode> failovers,
+    JsonRPC? client,
+    this.connectionTimeoutForSpecialCaseJsonRPCClients =
+        const Duration(seconds: 60),
+  }) {
     _prefs = prefs;
     _host = host;
     _port = port;
@@ -108,9 +113,9 @@ class ElectrumX {
   Future<dynamic> request({
     required String command,
     List<dynamic> args = const [],
-    Duration connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int retries = 2,
+    Duration requestTimeout = const Duration(seconds: 60),
   }) async {
     if (!(await _allow())) {
       throw WifiOnlyException();
@@ -121,26 +126,31 @@ class ElectrumX {
         host: host,
         port: port,
         useSSL: useSSL,
-        connectionTimeout: connectionTimeout,
+        connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
       );
     } else {
       _rpcClient = JsonRPC(
         host: failovers![currentFailoverIndex].address,
         port: failovers![currentFailoverIndex].port,
         useSSL: failovers![currentFailoverIndex].useSSL,
-        connectionTimeout: connectionTimeout,
+        connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
       );
     }
 
     try {
       final requestId = requestID ?? const Uuid().v1();
       final jsonArgs = json.encode(args);
-      final jsonRequestString =
+      final jsonRequestString = '{"jsonrpc": "2.0", '
-          '{"jsonrpc": "2.0", "id": "$requestId","method": "$command","params": $jsonArgs}';
+          '"id": "$requestId",'
+          '"method": "$command",'
+          '"params": $jsonArgs}';
 
       // Logging.instance.log("ElectrumX jsonRequestString: $jsonRequestString");
 
-      final response = await _rpcClient!.request(jsonRequestString);
+      final response = await _rpcClient!.request(
+        jsonRequestString,
+        requestTimeout,
+      );
 
       if (response.exception != null) {
         throw response.exception!;
@@ -174,7 +184,7 @@ class ElectrumX {
         return request(
           command: command,
           args: args,
-          connectionTimeout: connectionTimeout,
+          requestTimeout: requestTimeout,
           requestID: requestID,
           retries: retries - 1,
         );
@@ -187,7 +197,7 @@ class ElectrumX {
         return request(
           command: command,
           args: args,
-          connectionTimeout: connectionTimeout,
+          requestTimeout: requestTimeout,
           requestID: requestID,
         );
       } else {
@@ -204,7 +214,7 @@ class ElectrumX {
   Future<List<Map<String, dynamic>>> batchRequest({
     required String command,
     required Map<String, List<dynamic>> args,
-    Duration connectionTimeout = const Duration(seconds: 60),
+    Duration requestTimeout = const Duration(seconds: 60),
     int retries = 2,
   }) async {
     if (!(await _allow())) {
@@ -216,14 +226,14 @@ class ElectrumX {
         host: host,
         port: port,
         useSSL: useSSL,
-        connectionTimeout: connectionTimeout,
+        connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
       );
     } else {
       _rpcClient = JsonRPC(
         host: failovers![currentFailoverIndex].address,
         port: failovers![currentFailoverIndex].port,
         useSSL: failovers![currentFailoverIndex].useSSL,
-        connectionTimeout: connectionTimeout,
+        connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
       );
     }
 
@@ -246,7 +256,8 @@ class ElectrumX {
       // Logging.instance.log("batch request: $request");
 
       // send batch request
-      final jsonRpcResponse = (await _rpcClient!.request(request));
+      final jsonRpcResponse =
+          (await _rpcClient!.request(request, requestTimeout));
 
       if (jsonRpcResponse.exception != null) {
         throw jsonRpcResponse.exception!;
@@ -281,7 +292,7 @@ class ElectrumX {
         return batchRequest(
           command: command,
           args: args,
-          connectionTimeout: connectionTimeout,
+          requestTimeout: requestTimeout,
           retries: retries - 1,
         );
       } else {
@@ -293,7 +304,7 @@ class ElectrumX {
         return batchRequest(
           command: command,
           args: args,
-          connectionTimeout: connectionTimeout,
+          requestTimeout: requestTimeout,
         );
       } else {
         currentFailoverIndex = -1;
@@ -310,7 +321,7 @@ class ElectrumX {
       final response = await request(
         requestID: requestID,
         command: 'server.ping',
-        connectionTimeout: const Duration(seconds: 2),
+        requestTimeout: const Duration(seconds: 2),
         retries: retryCount,
       ).timeout(const Duration(seconds: 2)) as Map<String, dynamic>;
       return response.keys.contains("result") && response["result"] == null;
@@ -442,7 +453,7 @@ class ElectrumX {
       final response = await request(
         requestID: requestID,
         command: 'blockchain.scripthash.get_history',
-        connectionTimeout: const Duration(minutes: 5),
+        requestTimeout: const Duration(minutes: 5),
         args: [
           scripthash,
         ],
@@ -666,11 +677,13 @@ class ElectrumX {
   }) async {
     try {
       final response = await request(
-          requestID: requestID,
+        requestID: requestID,
-          command: 'lelantus.getusedcoinserials',
+        command: 'lelantus.getusedcoinserials',
-          args: [
+        args: [
-            "$startNumber",
+          "$startNumber",
-          ]);
+        ],
+        requestTimeout: const Duration(minutes: 2),
+      );
       return Map<String, dynamic>.from(response["result"] as Map);
     } catch (e) {
       Logging.instance.log(e, level: LogLevel.Error);

lib/electrumx_rpc/rpc.dart

@@ -79,7 +79,6 @@ class JsonRPC {
 
         // TODO different timeout length?
         req.initiateTimeout(
-          Duration(seconds: connectionTimeout.inSeconds ~/ 2),
           onTimedOut: () {
             _requestQueue.remove(req);
           },
@@ -88,7 +87,10 @@ class JsonRPC {
     });
   }
 
-  Future<JsonRPCResponse> request(String jsonRpcRequest) async {
+  Future<JsonRPCResponse> request(
+    String jsonRpcRequest,
+    Duration requestTimeout,
+  ) async {
     await _requestMutex.protect(() async {
       if (_socket == null) {
         Logging.instance.log(
@@ -101,6 +103,7 @@ class JsonRPC {
 
     final req = _JsonRPCRequest(
       jsonRequest: jsonRpcRequest,
+      requestTimeout: requestTimeout,
       completer: Completer<JsonRPCResponse>(),
     );
 
@@ -243,9 +246,14 @@ class _JsonRPCRequest {
 
   final String jsonRequest;
   final Completer<JsonRPCResponse> completer;
+  final Duration requestTimeout;
   final List<int> _responseData = [];
 
-  _JsonRPCRequest({required this.jsonRequest, required this.completer});
+  _JsonRPCRequest({
+    required this.jsonRequest,
+    required this.completer,
+    required this.requestTimeout,
+  });
 
   void appendDataAndCheckIfComplete(List<int> data) {
     _responseData.addAll(data);
@@ -263,11 +271,10 @@ class _JsonRPCRequest {
     }
   }
 
-  void initiateTimeout(
+  void initiateTimeout({
-    Duration timeout, {
     VoidCallback? onTimedOut,
   }) {
-    Future<void>.delayed(timeout).then((_) {
+    Future<void>.delayed(requestTimeout).then((_) {
       if (!isComplete) {
         try {
           throw Exception("_JsonRPCRequest timed out: $jsonRequest");

lib/pages/wallet_view/wallet_view.dart

@@ -927,22 +927,23 @@ class _WalletViewState extends ConsumerState<WalletView> {
                         );
                       },
                     ),
-                  WalletNavigationBarItemData(
+                  if (coin == Coin.banano)
-                      icon: SvgPicture.asset(
+                    WalletNavigationBarItemData(
-                        Assets.svg.monkey,
+                        icon: SvgPicture.asset(
-                        height: 20,
+                          Assets.svg.monkey,
-                        width: 20,
+                          height: 20,
-                        color: Theme.of(context)
+                          width: 20,
-                            .extension<StackColors>()!
+                          color: Theme.of(context)
-                            .bottomNavIconIcon,
+                              .extension<StackColors>()!
-                      ),
+                              .bottomNavIconIcon,
-                      label: "MonKey",
+                        ),
-                      onTap: () {
+                        label: "MonKey",
-                        Navigator.of(context).pushNamed(
+                        onTap: () {
-                          MonkeyView.routeName,
+                          Navigator.of(context).pushNamed(
-                          arguments: widget.walletId,
+                            MonkeyView.routeName,
-                        );
+                            arguments: widget.walletId,
-                      }),
+                          );
+                        }),
                   if (ref.watch(
                         walletsChangeNotifierProvider.select(
                           (value) => value

test/cached_electrumx_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/cached_electrumx_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:ui' as _i10;
@@ -28,8 +26,18 @@ import 'package:stackwallet/utilities/prefs.dart' as _i5;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -68,6 +76,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -86,9 +103,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -97,9 +114,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -108,7 +125,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -118,7 +135,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -359,7 +376,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -378,7 +395,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,

test/electrumx_test.dart

@@ -59,6 +59,7 @@ void main() {
       mockClient.request(
         '{"jsonrpc": "2.0", "id": "some requestId",'
         '"method": "$command","params": $jsonArgs}',
+        const Duration(seconds: 60),
       ),
     ).thenAnswer(
       (_) async => JsonRPCResponse(data: {
@@ -97,6 +98,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -132,6 +134,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -161,6 +164,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 2),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -195,6 +199,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 2),
         ),
       ).thenThrow(Exception());
 
@@ -224,6 +229,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -281,6 +287,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -310,6 +317,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -345,6 +353,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -377,6 +386,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -415,6 +425,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -446,6 +457,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 5),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -503,6 +515,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 5),
         ),
       ).thenThrow(Exception());
 
@@ -534,6 +547,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -599,6 +613,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -630,6 +645,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -667,6 +683,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -699,6 +716,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -734,6 +752,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -765,6 +784,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -800,6 +820,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -831,6 +852,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 2),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -866,6 +888,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 2),
         ),
       ).thenThrow(Exception());
 
@@ -897,6 +920,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -931,6 +955,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -963,6 +988,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -998,6 +1024,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -1031,6 +1058,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -1066,6 +1094,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -1099,6 +1128,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 2),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -1134,6 +1164,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(minutes: 2),
         ),
       ).thenThrow(Exception());
 
@@ -1165,6 +1196,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -1199,6 +1231,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 
@@ -1228,6 +1261,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenAnswer(
         (_) async => JsonRPCResponse(data: {
@@ -1264,6 +1298,7 @@ void main() {
         mockClient.request(
           '{"jsonrpc": "2.0", "id": "some requestId",'
           '"method": "$command","params": $jsonArgs}',
+          const Duration(seconds: 60),
         ),
       ).thenThrow(Exception());
 

test/electrumx_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/electrumx_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:ui' as _i9;
@@ -80,18 +78,27 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         ),
       ) as Duration);
   @override
-  _i3.Future<_i2.JsonRPCResponse> request(String? jsonRpcRequest) =>
+  _i3.Future<_i2.JsonRPCResponse> request(
+    String? jsonRpcRequest,
+    Duration? requestTimeout,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
           #request,
-          [jsonRpcRequest],
+          [
+            jsonRpcRequest,
+            requestTimeout,
+          ],
         ),
         returnValue:
             _i3.Future<_i2.JsonRPCResponse>.value(_FakeJsonRPCResponse_1(
           this,
           Invocation.method(
             #request,
-            [jsonRpcRequest],
+            [
+              jsonRpcRequest,
+              requestTimeout,
+            ],
           ),
         )),
       ) as _i3.Future<_i2.JsonRPCResponse>);

test/flutter_secure_storage_interface_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/flutter_secure_storage_interface_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 

test/json_rpc_test.dart

@@ -15,7 +15,10 @@ void main() {
 
     const jsonRequestString =
         '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
-    final result = await jsonRPC.request(jsonRequestString);
+    final result = await jsonRPC.request(
+      jsonRequestString,
+      const Duration(seconds: 1),
+    );
 
     expect(result.data, {"jsonrpc": "2.0", "result": null, "id": "some id"});
   });
@@ -30,7 +33,11 @@ void main() {
     const jsonRequestString =
         '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
 
-    expect(() => jsonRPC.request(jsonRequestString),
+    expect(
+        () => jsonRPC.request(
+              jsonRequestString,
+              const Duration(seconds: 1),
+            ),
         throwsA(isA<SocketException>()));
   });
 
@@ -45,7 +52,11 @@ void main() {
     const jsonRequestString =
         '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
 
-    expect(() => jsonRPC.request(jsonRequestString),
+    expect(
+        () => jsonRPC.request(
+              jsonRequestString,
+              const Duration(seconds: 1),
+            ),
         throwsA(isA<SocketException>()));
   });
 }

test/models/type_adapter_tests/lelantus_coin_adapter_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/models/type_adapter_tests/lelantus_coin_adapter_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:convert' as _i5;
 import 'dart:typed_data' as _i4;

test/models/type_adapter_tests/transactions_model_adapter_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/models/type_adapter_tests/transactions_model_adapter_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:convert' as _i5;
 import 'dart:typed_data' as _i4;

test/models/type_adapter_tests/utxo_model_adapter_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/models/type_adapter_tests/utxo_model_adapter_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:convert' as _i5;
 import 'dart:typed_data' as _i4;

test/notifications/notification_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/notifications/notification_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:typed_data' as _i6;

test/pages/send_view/send_view_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/pages/send_view/send_view_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
 import 'dart:typed_data' as _i30;

test/price_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/price_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:convert' as _i4;

test/screen_tests/address_book_view/address_book_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/address_book_view/address_book_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:ui' as _i5;

test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i11;

test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i9;

test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i9;

test/screen_tests/exchange/exchange_view_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/exchange/exchange_view_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i6;
 import 'dart:ui' as _i9;
@@ -1031,8 +1029,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i13.ChangeNowAPI {
               [],
               {#apiKey: apiKey},
             ),
-            returnValue: _i6.Future<
+            returnValue: _i6
-                    _i2.ExchangeResponse<List<_i20.FixedRateMarket>>>.value(
+                .Future<_i2.ExchangeResponse<List<_i20.FixedRateMarket>>>.value(
                 _FakeExchangeResponse_0<List<_i20.FixedRateMarket>>(
               this,
               Invocation.method(
@@ -1073,8 +1071,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i13.ChangeNowAPI {
                 #apiKey: apiKey,
               },
             ),
-            returnValue: _i6.Future<
+            returnValue: _i6
-                    _i2.ExchangeResponse<_i21.ExchangeTransaction>>.value(
+                .Future<_i2.ExchangeResponse<_i21.ExchangeTransaction>>.value(
                 _FakeExchangeResponse_0<_i21.ExchangeTransaction>(
               this,
               Invocation.method(
@@ -1130,8 +1128,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i13.ChangeNowAPI {
                 #apiKey: apiKey,
               },
             ),
-            returnValue: _i6.Future<
+            returnValue: _i6
-                    _i2.ExchangeResponse<_i21.ExchangeTransaction>>.value(
+                .Future<_i2.ExchangeResponse<_i21.ExchangeTransaction>>.value(
                 _FakeExchangeResponse_0<_i21.ExchangeTransaction>(
               this,
               Invocation.method(
@@ -1155,35 +1153,35 @@ class MockChangeNowAPI extends _i1.Mock implements _i13.ChangeNowAPI {
             )),
           ) as _i6.Future<_i2.ExchangeResponse<_i21.ExchangeTransaction>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i22.ExchangeTransactionStatus>>
+  _i6.Future<
-      getTransactionStatus({
+      _i2
+      .ExchangeResponse<_i22.ExchangeTransactionStatus>> getTransactionStatus({
     required String? id,
     String? apiKey,
   }) =>
-          (super.noSuchMethod(
+      (super.noSuchMethod(
-            Invocation.method(
+        Invocation.method(
-              #getTransactionStatus,
+          #getTransactionStatus,
-              [],
+          [],
-              {
+          {
-                #id: id,
+            #id: id,
-                #apiKey: apiKey,
+            #apiKey: apiKey,
-              },
+          },
-            ),
+        ),
-            returnValue: _i6.Future<
+        returnValue: _i6
-                    _i2.ExchangeResponse<_i22.ExchangeTransactionStatus>>.value(
+            .Future<_i2.ExchangeResponse<_i22.ExchangeTransactionStatus>>.value(
-                _FakeExchangeResponse_0<_i22.ExchangeTransactionStatus>(
+            _FakeExchangeResponse_0<_i22.ExchangeTransactionStatus>(
-              this,
+          this,
-              Invocation.method(
+          Invocation.method(
-                #getTransactionStatus,
+            #getTransactionStatus,
-                [],
+            [],
-                {
+            {
-                  #id: id,
+              #id: id,
-                  #apiKey: apiKey,
+              #apiKey: apiKey,
-                },
+            },
-              ),
+          ),
-            )),
+        )),
-          ) as _i6
+      ) as _i6.Future<_i2.ExchangeResponse<_i22.ExchangeTransactionStatus>>);
-              .Future<_i2.ExchangeResponse<_i22.ExchangeTransactionStatus>>);
   @override
   _i6.Future<_i2.ExchangeResponse<List<_i23.Pair>>>
       getAvailableFloatingRatePairs({bool? includePartners = false}) =>

test/screen_tests/lockscreen_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/lockscreen_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/main_view_tests/main_view_screen_testA_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/main_view_tests/main_view_screen_testB_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/main_view_tests/main_view_screen_testC_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/backup_key_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/backup_key_warning_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/create_pin_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/onboarding/name_your_wallet_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/name_your_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:ui' as _i5;

test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/restore_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i12;

test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/onboarding/verify_backup_key_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i11;

test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i11;

test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:ui' as _i7;

test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:ui' as _i5;

test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:ui' as _i5;

test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i14;

test/screen_tests/settings_view/settings_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/settings_view/settings_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
 import 'dart:ui' as _i9;

test/screen_tests/transaction_subviews/transaction_details_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:ui' as _i5;

test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/transaction_subviews/transaction_search_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:ui' as _i5;

test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/wallet_view/confirm_send_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/wallet_view/receive_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/screen_tests/wallet_view/send_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/wallet_view/send_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i12;

test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/screen_tests/wallet_view/wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
 import 'dart:ui' as _i10;

test/services/change_now/change_now_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/change_now/change_now_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 import 'dart:convert' as _i4;

test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 
@@ -26,8 +24,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +34,18 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,6 +84,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -94,9 +111,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -105,9 +122,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -116,7 +133,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -126,7 +143,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -367,7 +384,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -386,7 +403,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -408,7 +425,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),

test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 
@@ -26,8 +24,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +34,18 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,6 +84,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -94,9 +111,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -105,9 +122,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -116,7 +133,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -126,7 +143,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -367,7 +384,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -386,7 +403,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -408,7 +425,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),

test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/dogecoin/dogecoin_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 
@@ -26,8 +24,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +34,18 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,6 +84,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -94,9 +111,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -105,9 +122,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -116,7 +133,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -126,7 +143,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -367,7 +384,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -386,7 +403,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -408,7 +425,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),

test/services/coins/firo/firo_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/firo/firo_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 
@@ -32,8 +30,8 @@ import 'package:tuple/tuple.dart' as _i13;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -42,8 +40,8 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -52,8 +50,8 @@ class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
         );
 }
 
-class _FakeIsar_2 extends _i1.SmartFake implements _i4.Isar {
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
-  _FakeIsar_2(
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -62,9 +60,19 @@ class _FakeIsar_2 extends _i1.SmartFake implements _i4.Isar {
         );
 }
 
-class _FakeQueryBuilder_3<OBJ, R, S> extends _i1.SmartFake
+class _FakeIsar_3 extends _i1.SmartFake implements _i4.Isar {
+  _FakeIsar_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeQueryBuilder_4<OBJ, R, S> extends _i1.SmartFake
     implements _i4.QueryBuilder<OBJ, R, S> {
-  _FakeQueryBuilder_3(
+  _FakeQueryBuilder_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -103,6 +111,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -121,9 +138,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i5.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -132,9 +149,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i5.Future<dynamic>.value(),
@@ -143,7 +160,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i5.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -153,7 +170,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -394,7 +411,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -413,7 +430,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -435,7 +452,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),
@@ -603,7 +620,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
   @override
   _i4.Isar get isar => (super.noSuchMethod(
         Invocation.getter(#isar),
-        returnValue: _FakeIsar_2(
+        returnValue: _FakeIsar_3(
           this,
           Invocation.getter(#isar),
         ),
@@ -688,7 +705,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
               #getAddresses,
               [walletId],
             ),
-            returnValue: _FakeQueryBuilder_3<_i12.Address, _i12.Address,
+            returnValue: _FakeQueryBuilder_4<_i12.Address, _i12.Address,
                 _i4.QAfterWhereClause>(
               this,
               Invocation.method(
@@ -761,7 +778,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
               #getTransactions,
               [walletId],
             ),
-            returnValue: _FakeQueryBuilder_3<_i12.Transaction, _i12.Transaction,
+            returnValue: _FakeQueryBuilder_4<_i12.Transaction, _i12.Transaction,
                 _i4.QAfterWhereClause>(
               this,
               Invocation.method(
@@ -829,7 +846,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
           [walletId],
         ),
         returnValue:
-            _FakeQueryBuilder_3<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>(
+            _FakeQueryBuilder_4<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>(
           this,
           Invocation.method(
             #getUTXOs,
@@ -868,8 +885,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
             utxos,
           ],
         ),
-        returnValue: _i5.Future<bool>.value(),
+        returnValue: _i5.Future<bool>.value(false),
-        returnValueForMissingStub: _i5.Future<bool>.value(),
       ) as _i5.Future<bool>);
   @override
   _i5.Stream<_i12.UTXO?> watchUTXO({
@@ -896,7 +912,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
           #getTransactionNotes,
           [walletId],
         ),
-        returnValue: _FakeQueryBuilder_3<_i12.TransactionNote,
+        returnValue: _FakeQueryBuilder_4<_i12.TransactionNote,
             _i12.TransactionNote, _i4.QAfterWhereClause>(
           this,
           Invocation.method(
@@ -965,7 +981,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
               #getAddressLabels,
               [walletId],
             ),
-            returnValue: _FakeQueryBuilder_3<_i12.AddressLabel,
+            returnValue: _FakeQueryBuilder_4<_i12.AddressLabel,
                 _i12.AddressLabel, _i4.QAfterWhereClause>(
               this,
               Invocation.method(
@@ -1107,7 +1123,7 @@ class MockMainDB extends _i1.Mock implements _i9.MainDB {
               #getEthContracts,
               [],
             ),
-            returnValue: _FakeQueryBuilder_3<_i12.EthContract, _i12.EthContract,
+            returnValue: _FakeQueryBuilder_4<_i12.EthContract, _i12.EthContract,
                 _i4.QWhere>(
               this,
               Invocation.method(

test/services/coins/manager_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/manager_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i11;
 
@@ -105,8 +103,18 @@ class _FakeAmount_6 extends _i1.SmartFake implements _i8.Amount {
         );
 }
 
-class _FakeDecimal_7 extends _i1.SmartFake implements _i9.Decimal {
+class _FakeDuration_7 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_7(
+  _FakeDuration_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeDecimal_8 extends _i1.SmartFake implements _i9.Decimal {
+  _FakeDecimal_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -1074,6 +1082,15 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_7(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -1092,9 +1109,9 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
   _i11.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1103,9 +1120,9 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i11.Future<dynamic>.value(),
@@ -1114,7 +1131,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
   _i11.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -1124,7 +1141,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -1365,7 +1382,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_8(
           this,
           Invocation.method(
             #estimateFee,
@@ -1384,7 +1401,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_8(
           this,
           Invocation.method(
             #relayFee,

test/services/coins/namecoin/namecoin_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/namecoin/namecoin_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 
@@ -26,8 +24,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +34,18 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,6 +84,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -94,9 +111,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -105,9 +122,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -116,7 +133,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -126,7 +143,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -367,7 +384,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -386,7 +403,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -408,7 +425,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),

test/services/coins/particl/particl_wallet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/coins/particl/particl_wallet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 
@@ -26,8 +24,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDecimal_0(
+  _FakeDuration_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +34,18 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+class _FakeDecimal_1 extends _i1.SmartFake implements _i2.Decimal {
-  _FakeElectrumX_1(
+  _FakeDecimal_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_2 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,6 +84,15 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
         returnValueForMissingStub: null,
       );
   @override
+  Duration get connectionTimeoutForSpecialCaseJsonRPCClients =>
+      (super.noSuchMethod(
+        Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        returnValue: _FakeDuration_0(
+          this,
+          Invocation.getter(#connectionTimeoutForSpecialCaseJsonRPCClients),
+        ),
+      ) as Duration);
+  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
@@ -94,9 +111,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
     String? requestID,
     int? retries = 2,
+    Duration? requestTimeout = const Duration(seconds: 60),
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -105,9 +122,9 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
             #requestID: requestID,
             #retries: retries,
+            #requestTimeout: requestTimeout,
           },
         ),
         returnValue: _i4.Future<dynamic>.value(),
@@ -116,7 +133,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
+    Duration? requestTimeout = const Duration(seconds: 60),
     int? retries = 2,
   }) =>
       (super.noSuchMethod(
@@ -126,7 +143,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           {
             #command: command,
             #args: args,
-            #connectionTimeout: connectionTimeout,
+            #requestTimeout: requestTimeout,
             #retries: retries,
           },
         ),
@@ -367,7 +384,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #estimateFee,
@@ -386,7 +403,7 @@ class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_1(
           this,
           Invocation.method(
             #relayFee,
@@ -408,7 +425,7 @@ class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   @override
   _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_1(
+        returnValue: _FakeElectrumX_2(
           this,
           Invocation.getter(#electrumXClient),
         ),

test/services/wallets_service_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/services/wallets_service_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 

test/widget_tests/address_book_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/address_book_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:ui' as _i5;

test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/custom_buttons/favorite_toggle_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:typed_data' as _i6;

test/widget_tests/custom_loading_overlay_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/custom_loading_overlay_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:typed_data' as _i6;

test/widget_tests/desktop/desktop_scaffold_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/desktop/desktop_scaffold_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:typed_data' as _i6;

test/widget_tests/managed_favorite_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/managed_favorite_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
 import 'dart:typed_data' as _i29;

test/widget_tests/node_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/node_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:ui' as _i7;

test/widget_tests/node_options_sheet_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/node_options_sheet_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i11;
 import 'dart:ui' as _i13;

test/widget_tests/table_view/table_view_row_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/table_view/table_view_row_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i22;
 import 'dart:typed_data' as _i27;
@@ -2203,11 +2201,6 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  bool get hasFusionSupport => (super.noSuchMethod(
-        Invocation.getter(#hasFusionSupport),
-        returnValue: false,
-      ) as bool);
-  @override
   bool get hasTokenSupport => (super.noSuchMethod(
         Invocation.getter(#hasTokenSupport),
         returnValue: false,

test/widget_tests/trade_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/trade_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:typed_data' as _i6;

test/widget_tests/transaction_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/transaction_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i19;
 import 'dart:typed_data' as _i34;
@@ -3215,8 +3213,7 @@ class MockMainDB extends _i1.Mock implements _i14.MainDB {
             utxos,
           ],
         ),
-        returnValue: _i19.Future<void>.value(),
+        returnValue: _i19.Future<bool>.value(false),
-        returnValueForMissingStub: _i19.Future<void>.value(),
       ) as _i19.Future<bool>);
   @override
   _i19.Stream<_i22.UTXO?> watchUTXO({

test/widget_tests/wallet_card_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/wallet_card_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i21;
 import 'dart:typed_data' as _i28;

test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
 import 'dart:typed_data' as _i29;

test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart

@@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackwallet/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
 // Do not manually edit this file.
 
-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
 import 'dart:typed_data' as _i28;