diff --git a/lib/core/managers/course_repository.dart b/lib/core/managers/course_repository.dart index 26ca53ea6..b7f393496 100644 --- a/lib/core/managers/course_repository.dart +++ b/lib/core/managers/course_repository.dart @@ -510,8 +510,11 @@ class CourseRepository { /// Get the evaluation for a course or null if not found. CourseReview? _getReviewForCourse( Course course, Map> reviews) { + // Todo: changer pour firstWhereOrNull après update de Collection final review = reviews[course.session]?.where((element) => - element.acronym == course.acronym && element.group == course.group); - return review?.length == 1 ? review?.first : null; + element.acronym == course.acronym && element.group == course.group); + return review?.isNotEmpty ?? false + ? review?.first + : null; } } diff --git a/lib/core/viewmodels/more_viewmodel.dart b/lib/core/viewmodels/more_viewmodel.dart index e932f0752..0f3112816 100644 --- a/lib/core/viewmodels/more_viewmodel.dart +++ b/lib/core/viewmodels/more_viewmodel.dart @@ -60,7 +60,8 @@ class MoreViewModel extends FutureViewModel { Future futureToRun() async { try { setBusy(true); - await PackageInfo.fromPlatform(); + final packageInfo = await PackageInfo.fromPlatform(); + _appVersion = packageInfo.version; } catch (error) { onError(error); } finally {