Merge branch 'test/fix-curriculum-workflow' into test/release-v9-certs

Author: Sembauke

mobile-app/android/app/build.gradle

@@ -35,7 +35,7 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace 'org.freecodecamp'
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

mobile-app/integration_test/test_runner/test_runner_results.txt

@@ -0,0 +1,2 @@
+Failed tests:
+

mobile-app/integration_test_runner.dart

@@ -118,6 +118,7 @@ brew install applesimutils
         'test',
         '--no-pub',
         '--reporter=expanded',
+        '--ignore-timeouts',
         if (isMacOS) ...[
           '-d',
           bootedDeviceId,

mobile-app/lib/app/app.router.dart

@@ -1,4 +1,4 @@
-const chapterBasedSuperBlocks = ['full-stack-developer'];
+import 'package:freecodecamp/ui/views/learn/utils/learn_globals.dart';
 
 enum SuperBlocks {
   respWebDesignV9('responsive-web-design-v9'),
@@ -320,7 +320,8 @@ class Chapter {
 
 enum ModuleType {
   review('review'),
-  exam('exam');
+  exam('exam'),
+  certProject('cert-project');
 
   static ModuleType fromValue(String value) {
     return ModuleType.values.firstWhere(

mobile-app/lib/models/learn/curriculum_model.dart

@@ -36,8 +36,7 @@ class FccUserModel {
 
   final bool emailVerified;
   final bool isEmailVerified;
-  final bool acceptedPrivacyTerms;
-  final bool sendQuincyEmail;
+  final bool? sendQuincyEmail;
 
   final bool isCheater;
   final bool isDonating;
@@ -99,8 +98,7 @@ class FccUserModel {
     this.about,
     required this.emailVerified,
     required this.isEmailVerified,
-    required this.acceptedPrivacyTerms,
-    required this.sendQuincyEmail,
+    this.sendQuincyEmail,
     required this.isCheater,
     required this.isDonating,
     required this.isHonest,
@@ -154,7 +152,6 @@ class FccUserModel {
       about: data['about'],
       emailVerified: data['emailVerified'],
       isEmailVerified: data['isEmailVerified'],
-      acceptedPrivacyTerms: data['acceptedPrivacyTerms'],
       sendQuincyEmail: data['sendQuincyEmail'],
       isCheater: data['isCheater'],
       isDonating: data['isDonating'] ?? false,

mobile-app/lib/models/main/user_model.dart

@@ -12,7 +12,6 @@ import 'package:freecodecamp/app/app.router.dart';
 import 'package:freecodecamp/extensions/i18n_extension.dart';
 import 'package:freecodecamp/models/main/user_model.dart';
 import 'package:freecodecamp/service/dio_service.dart';
-import 'package:freecodecamp/ui/views/auth/privacy_view.dart';
 import 'package:stacked_services/stacked_services.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -318,33 +317,6 @@ class AuthenticationService {
       return false;
     }
 
-    final user = await userModel;
-
-    if (user != null && user.acceptedPrivacyTerms == false) {
-      bool? quincyEmails = await Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => const PrivacyView(),
-          settings: const RouteSettings(
-            name: '/new-user-accept-privacy',
-          ),
-        ),
-      );
-
-      await _dio.put(
-        '$baseApiURL/update-privacy-terms',
-        data: {
-          'quincyEmails': quincyEmails ?? false,
-        },
-        options: Options(
-          headers: {
-            'CSRF-Token': _csrfToken,
-            'Cookie': 'jwt_access_token=$_jwtAccessToken; _csrf=$_csrf',
-          },
-        ),
-      );
-    }
-
     await auth0.credentialsManager.clearCredentials();
     // ignore: unnecessary_null_comparison
     if (res != null) {