Merge branch 'main' into refactor/challenge-view

freeCodeCamp · Feb 27, 2025 · 9a124ea · 9a124ea
2 parents 2434183 + 764e122
commit 9a124ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/mobile-app/lib/service/firebase/remote_config_service.dart b/mobile-app/lib/service/firebase/remote_config_service.dart
@@ -24,7 +24,7 @@ class RemoteConfigService {
         ),
       );
       await remoteConfig.setDefaults({
-        'min_app_version': '5.0.0',
+        'min_app_version': '5.0.1',
       });
 
       await remoteConfig.fetchAndActivate();

diff --git a/mobile-app/lib/ui/views/learn/challenge/templates/english/english_view.dart b/mobile-app/lib/ui/views/learn/challenge/templates/english/english_view.dart
@@ -132,18 +132,18 @@ class EnglishView extends StatelessWidget {
                     ),
                   Column(
                     children: [
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text(
-                          'Fill in the Blanks',
-                          style: TextStyle(
-                            fontSize: FontSize.large.value,
-                            fontWeight: FontWeight.bold,
-                            fontFamily: 'Inter',
+                      if (challenge.fillInTheBlank != null) ...[
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Text(
+                            'Fill in the Blanks',
+                            style: TextStyle(
+                              fontSize: FontSize.large.value,
+                              fontWeight: FontWeight.bold,
+                              fontFamily: 'Inter',
+                            ),
                           ),
                         ),
-                      ),
-                      if (challenge.fillInTheBlank != null)
                         Container(
                           color: const Color(0xFF0a0a23),
                           margin: const EdgeInsets.all(8),
@@ -163,6 +163,7 @@ class EnglishView extends StatelessWidget {
                             ],
                           ),
                         ),
+                      ],
                       Row(
                         children: [
                           Expanded(
@@ -190,7 +191,7 @@ class EnglishView extends StatelessWidget {
                                             block)
                                     : () => {model.checkAnswers(challenge)},
                                 child: Text(
-                                  model.allInputsCorrect
+                                  model.allInputsCorrect || challenge.fillInTheBlank == null
                                       ? 'Go to Next Challenge'
                                       : 'Check Answers',
                                   style: const TextStyle(fontSize: 20),

diff --git a/mobile-app/pubspec.yaml b/mobile-app/pubspec.yaml
@@ -1,7 +1,7 @@
 name: freecodecamp
 description: freecodecamp.org app.
 publish_to: none
-version: 5.0.0+50000
+version: 5.0.1+50001
 environment:
   sdk: ">=3.0.0 <4.0.0"
 dependencies: