@ -209,7 +209,10 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
lazy var messageRequestView : UIView = {
lazy var messageRequestView : UIView = {
let result : UIView = UIView ( )
let result : UIView = UIView ( )
result . translatesAutoresizingMaskIntoConstraints = false
result . translatesAutoresizingMaskIntoConstraints = false
result . isHidden = ( self . viewModel . threadData . threadIsMessageRequest = = false )
result . isHidden = (
self . viewModel . threadData . threadIsMessageRequest = = false ||
self . viewModel . threadData . threadRequiresApproval = = true
)
result . setGradient ( Gradients . defaultBackground )
result . setGradient ( Gradients . defaultBackground )
return result
return result
@ -558,11 +561,21 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
}
}
if initialLoad || viewModel . threadData . threadIsMessageRequest != updatedThreadData . threadIsMessageRequest {
if initialLoad || viewModel . threadData . threadIsMessageRequest != updatedThreadData . threadIsMessageRequest {
messageRequestView . isHidden = ( updatedThreadData . threadIsMessageRequest = = false )
scrollButtonMessageRequestsBottomConstraint ? . isActive = ( updatedThreadData . threadIsMessageRequest = = true )
scrollButtonMessageRequestsBottomConstraint ? . isActive = ( updatedThreadData . threadIsMessageRequest = = true )
scrollButtonBottomConstraint ? . isActive = ( updatedThreadData . threadIsMessageRequest = = false )
scrollButtonBottomConstraint ? . isActive = ( updatedThreadData . threadIsMessageRequest = = false )
}
}
if
initialLoad ||
viewModel . threadData . threadRequiresApproval != updatedThreadData . threadRequiresApproval ||
viewModel . threadData . threadIsMessageRequest != updatedThreadData . threadIsMessageRequest
{
messageRequestView . isHidden = (
updatedThreadData . threadIsMessageRequest = = false ||
updatedThreadData . threadRequiresApproval = = true
)
}
if initialLoad || viewModel . threadData . threadUnreadCount != updatedThreadData . threadUnreadCount {
if initialLoad || viewModel . threadData . threadUnreadCount != updatedThreadData . threadUnreadCount {
updateUnreadCountView ( unreadCount : updatedThreadData . threadUnreadCount )
updateUnreadCountView ( unreadCount : updatedThreadData . threadUnreadCount )
}
}
@ -871,7 +884,13 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
navigationItem . rightBarButtonItems = [ ]
navigationItem . rightBarButtonItems = [ ]
}
}
else {
else {
guard let threadData : SessionThreadViewModel = threadData , threadData . threadRequiresApproval = = false else {
guard
let threadData : SessionThreadViewModel = threadData ,
(
threadData . threadRequiresApproval = = false &&
threadData . threadIsMessageRequest = = false
)
else {
// N o t e : A d d i n g e m p t y b u t t o n s b e c a u s e w i t h o u t i t t h e t i t l e a l i g n m e n t i s b u s t e d ( N o t e : T h e s i z e w a s
// N o t e : A d d i n g e m p t y b u t t o n s b e c a u s e w i t h o u t i t t h e t i t l e a l i g n m e n t i s b u s t e d ( N o t e : T h e s i z e w a s
// t a k e n f r o m t h e l a y o u t i n s p e c t o r f o r t h e b a c k b u t t o n i n X c o d e
// t a k e n f r o m t h e l a y o u t i n s p e c t o r f o r t h e b a c k b u t t o n i n X c o d e
navigationItem . rightBarButtonItems = [
navigationItem . rightBarButtonItems = [
@ -914,7 +933,7 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
settingsButtonItem . accessibilityLabel = " Settings button "
settingsButtonItem . accessibilityLabel = " Settings button "
settingsButtonItem . isAccessibilityElement = true
settingsButtonItem . isAccessibilityElement = true
if SessionCall . isEnabled && ! threadData . threadIsNoteToSelf && threadData . threadIsMessageRequest = = false {
if SessionCall . isEnabled && ! threadData . threadIsNoteToSelf {
let callButton = UIBarButtonItem (
let callButton = UIBarButtonItem (
image : UIImage ( named : " Phone " ) ,
image : UIImage ( named : " Phone " ) ,
style : . plain ,
style : . plain ,