32d7dd2ea6 
								
							
								 
							
						 
						
							
							
								
								refactor on accessibility of SessionButton.Info, and fix some unit tests on disappearing messages config  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								be7881ad2e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								c9d7565ebe 
								
							
								 
							
						 
						
							
							
								
								update unit test for disappearing messages  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f1e9412c7a 
								
							
								 
							
						 
						
							
							
								
								Added in missing code changes unrelated to closed groups rebuild  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								952751603b 
								
							
								 
							
						 
						
							
							
								
								add accessibility id for footer button in session table view controller  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								bd23e7ec4a 
								
							
								 
							
						 
						
							
							
								
								add min width for footer button in session tableview vc  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								06d635fc30 
								
							
								 
							
						 
						
							
							
								
								Added the 'footerButton' UI the SessionTableViewController  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								40109e0bea 
								
							
								 
							
						 
						
							
							
								
								Cleaned up the config-based table view controller to be more reusable  
							
							... 
							
							
							
							Updated the settings screens to have the "rounded group" styling
Added a "loading conversations" label to the Message Requests screen before the conversations load
Removed the legacy UserCell (replaced with the more reusable 'SessionCell')
Renamed a few things to make them more generic and reusable 
							
						 
						
							3 years ago