Merge pull request #2481 from Pylons-tech/fix-git-workflow

Fix git workflow

.github/workflows/codeql-default.yml

@@ -13,7 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main", [dmsm][eata][vsai][!o]* ]
+    branches:
+      - "main"
+      - "dmsm*"
+      - "eata*"
+      - "vsai*"
+      - "!o*"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "main" ]

.github/workflows/flutter.yml

@@ -47,6 +47,7 @@ jobs:
           cd easel
           touch lib/env.dart
           echo "const apiKey = \"${{ secrets.EASEL_TOKEN }}\"; " >> lib/env.dart
+          echo "const X_API_KEY = \"${{ secrets.X_API_KEY }}\"; " >> lib/env.dart
           ./android/app/json_manipulator.sh RANDOM_STRING
           flutter pub get
           flutter analyze

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.22.5
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

easel/analysis_options.yaml

@@ -14,7 +14,6 @@ analyzer:
 #    implicit-dynamic: true
   errors:
     avoid_setters_without_getters: ignore
-    import_of_legacy_library_into_null_safe: error
     avoid_single_cascade_in_expression_statements: ignore
     missing_required_param: error
 #    implicit_dynamic_map_literal: ignore

easel/lib/repository/repository.dart

@@ -324,8 +324,8 @@ class RepositoryImp implements Repository {
     try {
       final storageResponseModel = await remoteDataSource.uploadFile(file: file, uploadProgressCallback: onUploadProgressCallback);
       return Right(storageResponseModel);
-    } on Exception catch (_) {
-      crashlyticsHelper.recordFatalError(error: _.toString());
+    } on Exception catch (e) {
+      crashlyticsHelper.recordFatalError(error: e.toString());
       return Left(CacheFailure(LocaleKeys.update_failed.tr()));
     }
   }

easel/lib/widgets/loading.dart

@@ -21,7 +21,6 @@ class Loading {
     }
     return showDialog(
       context: navigatorKey.currentState!.overlay!.context,
-      barrierDismissible: true,
       barrierColor: Colors.white.withOpacity(0),
       builder: (ctx) => PopScope(
         canPop: false,

easel/lib/widgets/loading_with_progress.dart

@@ -25,7 +25,6 @@ class LoadingProgress {
     }
     return showDialog(
       context: navigatorKey.currentState!.overlay!.context,
-      barrierDismissible: true,
       builder: (ctx) => PopScope(
         canPop: false,
         child: AlertDialog(

wallet/analysis_options.yaml

@@ -14,7 +14,6 @@ analyzer:
 #    implicit-dynamic: true
   errors:
     avoid_setters_without_getters: ignore
-    import_of_legacy_library_into_null_safe: error
     avoid_single_cascade_in_expression_statements: ignore
     missing_required_param: error
 #    implicit_dynamic_map_literal: ignore

wallet/lib/components/loading.dart

@@ -35,7 +35,6 @@ class Loading {
     }
     return showDialog(
       context: navigatorKey.currentState!.overlay!.context,
-      barrierDismissible: true,
       barrierColor: Colors.white.withOpacity(0),
       builder: (ctx) => PopScope(
         canPop: false,

wallet/lib/components/no_internet.dart

@@ -35,7 +35,6 @@ class NoInternetDialog {
 
     return showDialog(
       context: navigatorKey.currentState!.overlay!.context,
-      barrierDismissible: true,
       barrierColor: Colors.white.withOpacity(0),
       builder: (ctx) {
         setIsShowing = true;

wallet/lib/pages/detailed_asset_view/widgets/wallpaper_set_screen.dart

@@ -50,7 +50,7 @@ class _WallpaperScreenState extends State<_WallpaperScreen> {
       downloading.value = true;
     }, onDone: () async {
       downloading.value = false;
-      await Wallpaper.lockScreen(options: RequestSizeOptions.RESIZE_FIT);
+      await Wallpaper.lockScreen();
       done.value = true;
     }, onError: (error) {
       downloading.value = false;

wallet/test/mocks/test_mocks.mocks.dart

@@ -920,23 +920,24 @@ class MockFirebaseAppCheck extends _i1.Mock implements _i19.FirebaseAppCheck {
       ) as Map<dynamic, dynamic>);
   @override
   _i8.Future<void> activate({
-    String? webRecaptchaSiteKey,
-    _i20.AndroidProvider? androidProvider = _i20.AndroidProvider.playIntegrity,
-    _i20.AppleProvider? appleProvider = _i20.AppleProvider.deviceCheck,
+    _i20.AndroidProvider androidProvider = _i20.AndroidProvider.playIntegrity, // Set a default value if necessary
+    _i20.AppleProvider appleProvider = _i20.AppleProvider.deviceCheck, // Set a default value if necessary
+    _i20.WebProvider? webProvider,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
           #activate,
           [],
           {
-            #webRecaptchaSiteKey: webRecaptchaSiteKey,
             #androidProvider: androidProvider,
             #appleProvider: appleProvider,
+            #webProvider: webProvider,
           },
         ),
         returnValue: _i8.Future<void>.value(),
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
+
   @override
   _i8.Future<String?> getToken([bool? forceRefresh]) => (super.noSuchMethod(
         Invocation.method(

wallet/test/widget_testing/extension/size_extension.dart

@@ -36,6 +36,6 @@ extension SetScreenSize on WidgetTester {
           ),
         ),
       );
-    }), duration);
+    }), duration: duration);
   }
 }

wallet/test/widget_testing/helpers/size_extensions.dart

@@ -24,6 +24,6 @@ extension SetScreenSize on WidgetTester {
               }),
             );
           });
-    }), duration);
+    }), duration: duration);
   }
 }