fix: Resolve conflicts

edx · Jul 25, 2024 · 40cf719 · 40cf719
1 parent 625918c
commit 40cf719
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt
@@ -120,9 +120,6 @@ class CourseContainerViewModel(
         get() = iapConfig.isEnabled &&
                 iapConfig.disableVersions.contains(appData.versionName).not()
 
-    private val isPaymentEnabled
-        get() = isIAPEnabled && isValuePropEnabled
-
     private var _canShowUpgradeButton = MutableStateFlow(false)
     val canShowUpgradeButton: StateFlow<Boolean>
         get() = _canShowUpgradeButton.asStateFlow()
@@ -210,7 +207,7 @@ class CourseContainerViewModel(
                 _courseDetails = interactor.getEnrollmentDetails(courseId)
                 _courseDetails?.let { courseDetails ->
                     courseName = courseDetails.courseInfoOverview.name
-                    _canShowUpgradeButton.value = isPaymentEnabled && courseDetails.isUpgradeable
+                    _canShowUpgradeButton.value = isIAPEnabled && courseDetails.isUpgradeable
                     loadCourseImage(courseDetails.courseInfoOverview.media?.image?.large)
                     if (courseDetails.hasAccess.isFalse()) {
                         _showProgress.value = false
@@ -339,7 +336,7 @@ class CourseContainerViewModel(
             try {
                 _courseStructure = interactor.getCourseStructure(courseId, isNeedRefresh = true)
                 _canShowUpgradeButton.value =
-                    isPaymentEnabled && courseStructure?.isUpgradeable.isTrue()
+                    isIAPEnabled && courseStructure?.isUpgradeable.isTrue()
             } catch (e: Exception) {
                 if (e.isInternetError()) {
                     _errorMessage.value =