From 6e959b505821e78e3623131eb3788b37eb86f59e Mon Sep 17 00:00:00 2001
From: Meera Joshi <112877973+meeragjoshi@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:40:03 -0500
Subject: [PATCH] Fix Lint Errors (#126)

---
 analysis_options.yaml                                       | 4 ++--
 .../models/chia_wallet_info/chia_wallet_info.dart           | 2 ++
 .../service/wallet_client/full_node_request_handler.dart    | 6 ++----
 lib/src/offer/service/cat_offer_service_base.dart           | 3 +--
 .../spawn_and_wait_for_isolate.dart                         | 6 ++----
 pubspec.yaml                                                | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 75120bd2..79a6edc7 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,5 @@
-# include: package:lints/recommended.yaml
-include: package:very_good_analysis/analysis_options.yaml
+include: package:lints/recommended.yaml
+# include: package:very_good_analysis/analysis_options.yaml
 
 analyzer:
   exclude:
diff --git a/lib/src/api/wallet_connect/models/chia_wallet_info/chia_wallet_info.dart b/lib/src/api/wallet_connect/models/chia_wallet_info/chia_wallet_info.dart
index 034a11aa..9c4f1604 100644
--- a/lib/src/api/wallet_connect/models/chia_wallet_info/chia_wallet_info.dart
+++ b/lib/src/api/wallet_connect/models/chia_wallet_info/chia_wallet_info.dart
@@ -166,6 +166,8 @@ extension NftInfosGetterX on Map<int, NftWalletInfoWithNftInfos> {
           value.nftInfos.map((nftInfo) => nftInfo.launcherId).toList(),
         ),
       );
+
+  List<Bytes> get launcherIds => launcherIdsMap.values.toList().flatten();
 }
 
 extension NftInfosListGetterX on List<NftWalletInfoWithNftInfos> {
diff --git a/lib/src/api/wallet_connect/service/wallet_client/full_node_request_handler.dart b/lib/src/api/wallet_connect/service/wallet_client/full_node_request_handler.dart
index 9d680335..595f0a6c 100644
--- a/lib/src/api/wallet_connect/service/wallet_client/full_node_request_handler.dart
+++ b/lib/src/api/wallet_connect/service/wallet_client/full_node_request_handler.dart
@@ -149,10 +149,8 @@ class FullNodeWalletConnectRequestHandler
     final nftRecordsToAdd = nftRecords
         .where(
           (nftRecord) =>
-              !currentNftWallets.launcherIdsMap
-                  .containsValue(nftRecord.launcherId) ||
-              nftWalletsToRemove.launcherIdsMap
-                  .containsValue(nftRecord.launcherId) ||
+              !currentNftWallets.launcherIds.contains(nftRecord.launcherId) ||
+              nftWalletsToRemove.launcherIds.contains(nftRecord.launcherId) ||
               (nftWalletsWithNullDid.isNotEmpty &&
                   nftWalletsWithNullDid.nftInfos
                       .map((e) => e.launcherId)
diff --git a/lib/src/offer/service/cat_offer_service_base.dart b/lib/src/offer/service/cat_offer_service_base.dart
index fe418856..45d7b6d2 100644
--- a/lib/src/offer/service/cat_offer_service_base.dart
+++ b/lib/src/offer/service/cat_offer_service_base.dart
@@ -473,8 +473,7 @@ class OfferWalletService {
       CoinPrototype coin,
       CoinSpend parentSpend,
       Program innerRoyaltySolution,
-    )
-        makeSolutionFromInnerSolution,
+    ) makeSolutionFromInnerSolution,
   ) {
     var royaltyPayments =
         List<RoyaltyPaymentWithLauncherId>.from(royaltyPayments_);
diff --git a/lib/src/utils/spawn_and_wait_for_isolate/spawn_and_wait_for_isolate.dart b/lib/src/utils/spawn_and_wait_for_isolate/spawn_and_wait_for_isolate.dart
index 14e0346e..34ea35aa 100644
--- a/lib/src/utils/spawn_and_wait_for_isolate/spawn_and_wait_for_isolate.dart
+++ b/lib/src/utils/spawn_and_wait_for_isolate/spawn_and_wait_for_isolate.dart
@@ -37,8 +37,7 @@ Future<T> spawnAndWaitForIsolateWithProgressUpdates<T, R>({
   required FutureOr<Map<String, dynamic>> Function(
     R taskArgument,
     void Function(double progress) onProgressUpdate,
-  )
-      isolateTask,
+  ) isolateTask,
   required FutureOr<T> Function(Map<String, dynamic> taskResultJson)
       handleTaskCompletion,
 }) async {
@@ -110,8 +109,7 @@ Future<void> Function(TaskArgumentAndSendPort<R> taskArgumentAndSendPort)
   FutureOr<Map<String, dynamic>> Function(
     R taskArgument,
     void Function(double progress) onProgressUpdate,
-  )
-      task,
+  ) task,
 ) {
   return (TaskArgumentAndSendPort<R> taskArgumentAndSendPort) async {
     final taskResultJson = await task(
diff --git a/pubspec.yaml b/pubspec.yaml
index b6475a22..127435ae 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,7 +38,7 @@ dependencies:
   yaml: ^3.1.1
 
 dev_dependencies:
-  lints: ^1.0.0
+  lints: ^2.0.1
   rps: ^0.6.3
   test: ^1.19.3
   test_process: ^2.1.0