@ -875,7 +875,6 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
guard self . hasLoadedInitialInteractionData else {
guard self . hasLoadedInitialInteractionData else {
// N e e d t o d i s p a t c h a s y n c t o p r e v e n t t h i s f r o m c a u s i n g g l i t c h e s i n t h e p u s h a n i m a t i o n
// N e e d t o d i s p a t c h a s y n c t o p r e v e n t t h i s f r o m c a u s i n g g l i t c h e s i n t h e p u s h a n i m a t i o n
DispatchQueue . main . async {
DispatchQueue . main . async {
self . hasLoadedInitialInteractionData = true
self . viewModel . updateInteractionData ( updatedData )
self . viewModel . updateInteractionData ( updatedData )
// U p d a t e t h e e m p t y s t a t e
// U p d a t e t h e e m p t y s t a t e
@ -883,6 +882,7 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
UIView . performWithoutAnimation {
UIView . performWithoutAnimation {
self . tableView . reloadData ( )
self . tableView . reloadData ( )
self . hasLoadedInitialInteractionData = true
self . performInitialScrollIfNeeded ( )
self . performInitialScrollIfNeeded ( )
}
}
}
}
@ -1191,7 +1191,11 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
}
}
private func autoLoadNextPageIfNeeded ( ) {
private func autoLoadNextPageIfNeeded ( ) {
guard ! self . isAutoLoadingNextPage && ! self . isLoadingMore else { return }
guard
self . hasLoadedInitialInteractionData &&
! self . isAutoLoadingNextPage &&
! self . isLoadingMore
else { return }
self . isAutoLoadingNextPage = true
self . isAutoLoadingNextPage = true