Hide no discussion while update (#59)

openedx · Jul 21, 2023 · f731d6d · f731d6d
1 parent 11f2aad
commit f731d6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Discussion/Discussion/Presentation/Posts/PostsView.swift b/Discussion/Discussion/Presentation/Posts/PostsView.swift
@@ -157,7 +157,7 @@ public struct PostsView: View {
                                                 Spacer(minLength: 84)
                                             }
                                         } else {
-                                            if !viewModel.isShowProgress {
+                                            if !viewModel.fetchInProgress {
                                                 VStack(spacing: 0) {
                                                     CoreAssets.discussionIcon.swiftUIImage
                                                         .renderingMode(.template)

diff --git a/Discussion/Discussion/Presentation/Posts/PostsViewModel.swift b/Discussion/Discussion/Presentation/Posts/PostsViewModel.swift
@@ -176,9 +176,11 @@ public class PostsViewModel: ObservableObject {
                 if index == filteredPosts.count - 3 {
                     if totalPages != 1 {
                         if nextPage <= totalPages {
-                            _ = await getPosts(courseID: courseID,
-                                               pageNumber: self.nextPage,
-                                               withProgress: withProgress)
+                            _ = await getPosts(
+                                courseID: courseID,
+                                pageNumber: self.nextPage,
+                                withProgress: withProgress
+                            )
                         }
                     }
                 }
@@ -202,7 +204,6 @@ public class PostsViewModel: ObservableObject {
                 if threads.threads.indices.contains(0) {
                     self.totalPages = threads.threads[0].numPages
                     self.nextPage += 1
-                    fetchInProgress = false
                 }
             case .followingPosts:
                 threads.threads += try await interactor
@@ -214,7 +215,6 @@ public class PostsViewModel: ObservableObject {
                 if threads.threads.indices.contains(0) {
                     self.totalPages = threads.threads[0].numPages
                     self.nextPage += 1
-                    fetchInProgress = false
                 }
             case .nonCourseTopics:
                 threads.threads += try await interactor
@@ -226,7 +226,6 @@ public class PostsViewModel: ObservableObject {
                 if threads.threads.indices.contains(0) {
                     self.totalPages = threads.threads[0].numPages
                     self.nextPage += 1
-                    fetchInProgress = false
                 }
             case .courseTopics(topicID: let topicID):
                 threads.threads += try await interactor
@@ -238,7 +237,6 @@ public class PostsViewModel: ObservableObject {
                 if threads.threads.indices.contains(0) {
                     self.totalPages = threads.threads[0].numPages
                     self.nextPage += 1
-                    fetchInProgress = false
                 }
             case .none:
                 isShowProgress = false
@@ -248,9 +246,11 @@ public class PostsViewModel: ObservableObject {
             filteredPosts = discussionPosts
             self.filteredPosts = self.discussionPosts
             isShowProgress = false
+            fetchInProgress = false
             return true
         } catch let error {
             isShowProgress = false
+            fetchInProgress = false
             if error.isInternetError {
                 errorMessage = CoreLocalization.Error.slowOrNoInternetConnection
             } else {