Session Pro Backend Integration 2

Session.xcodeproj/project.pbxproj

@@ -9697,6 +9697,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 698;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -9742,6 +9743,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 698;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -10397,6 +10399,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 698;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -10415,6 +10418,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = NO;
+				MARKETING_VERSION = 2.15.1;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
 				PRODUCT_NAME = Session;
@@ -10968,6 +10972,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 698;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -10986,6 +10991,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = NO;
+				MARKETING_VERSION = 2.15.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
 				PRODUCT_NAME = Session;
 				PROVISIONING_PROFILE = "";

Session/Closed Groups/NewClosedGroupVC.swift

@@ -306,7 +306,17 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                 id: item.profileId,
                 position: Position.with(indexPath.row, count: data[indexPath.section].elements.count),
                 leadingAccessory: .profile(id: item.profileId, profile: item.profile),
-                title: (item.profile?.displayName() ?? item.profileId.truncated()),
+                title: SessionCell.TextInfo(
+                    (item.profile?.displayName() ?? item.profileId.truncated()),
+                    font: .title,
+                    trailingImage: (
+                        dependencies[singleton: .sessionProManager].profileFeatures(for: item.profile).contains(.proBadge) == true ?
+                            SessionProBadge.trailingImage(
+                                size: .small,
+                                themeBackgroundColor: .primary
+                            ) : nil
+                    )
+                ),
                 trailingAccessory: .radio(isSelected: selectedProfileIds.contains(item.profileId)),
                 styling: SessionCell.StyleInfo(backgroundStyle: .edgeToEdge),
                 accessibility: Accessibility(

Session/Conversations/ConversationVC+Interaction.swift

@@ -493,17 +493,15 @@ extension ConversationVC:
     }
 
     func handleLibraryButtonTapped() {
-        let threadId: String = self.viewModel.state.threadId
-        let threadVariant: SessionThread.Variant = self.viewModel.state.threadVariant
+        let threadInfo: ConversationInfoViewModel = self.viewModel.state.threadInfo
         let quoteViewModel: QuoteViewModel? = self.snInputView.quoteViewModel
 
         Permissions.requestLibraryPermissionIfNeeded(isSavingMedia: false, using: viewModel.dependencies) { [weak self, dependencies = viewModel.dependencies] granted in
             guard granted else { return }
 
             DispatchQueue.main.async {
                 let sendMediaNavController = SendMediaNavigationController.showingMediaLibraryFirst(
-                    threadId: threadId,
-                    threadVariant: threadVariant,
+                    threadInfo: threadInfo,
                     quoteViewModel: quoteViewModel,
                     onQuoteCancelled: { [weak self] in
                         self?.snInputView.quoteViewModel = nil
@@ -527,8 +525,7 @@ extension ConversationVC:
         }
 
         let sendMediaNavController = SendMediaNavigationController.showingCameraFirst(
-            threadId: self.viewModel.state.threadId,
-            threadVariant: self.viewModel.state.threadVariant,
+            threadInfo: self.viewModel.state.threadInfo,
             quoteViewModel: self.snInputView.quoteViewModel,
             onQuoteCancelled: { [weak self] in
                 self?.snInputView.quoteViewModel = nil
@@ -551,8 +548,7 @@ extension ConversationVC:
         let viewController: AttachmentApprovalViewController = AttachmentApprovalViewController(
             mode: .modal,
             delegate: self,
-            threadId: self.viewModel.state.threadId,
-            threadVariant: self.viewModel.state.threadVariant,
+            threadInfo: self.viewModel.state.threadInfo,
             attachments: attachments,
             messageText: snInputView.text,
             quoteViewModel: snInputView.quoteViewModel,

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -113,6 +113,8 @@ class ThreadSettingsViewModel: SessionListScreenContent.ViewModelType, Navigatio
         public var footer: String? { return nil }
 
         public var extraVerticalPadding: CGFloat { return 0 }
+
+        public var shadow: Bool { return false }
     }
 
     public enum ListItem: Differentiable {
@@ -396,25 +398,21 @@ class ThreadSettingsViewModel: SessionListScreenContent.ViewModelType, Navigatio
                         info: ListItemTappableText.Info(
                             text: threadDisplayName,
                             font: Fonts.Headings.H4,
-                            imageAttachmentPosition: .trailing,
-                            imageAttachmentGenerator: {
+                            imageAttachment: {
                                 guard
                                     state.threadInfo.shouldShowProBadge &&
                                     !state.threadInfo.isNoteToSelf
                                 else { return nil }
 
-                                let imageAttachmentGenerator = (
-                                    UIView.image(
-                                        for: .themedKey(
-                                            SessionProBadge.Size.medium.cacheKey,
-                                            themeBackgroundColor: .primary
-                                        ),
-                                        generator: { SessionProBadge(size: .medium) }
+                                return SessionListScreenContent.TextInfo.ImageAttachment(
+                                    position: .trailing,
+                                    cacheKey: .themedKey(
+                                        SessionProBadge.Size.medium.cacheKey,
+                                        themeBackgroundColor: .primary
                                     ),
-                                    SessionProBadge.accessibilityLabel
+                                    accessibilityLabel: SessionProBadge.accessibilityLabel,
+                                    viewGenerator: { SessionProBadge(size: .medium) }
                                 )
-
-                                return { imageAttachmentGenerator }
                             }(),
                             onTextTap: { [weak viewModel] in
                                 guard let info: ConfirmationModal.Info = viewModel?.updateDisplayNameModal(state: state) else {
@@ -424,7 +422,15 @@ class ThreadSettingsViewModel: SessionListScreenContent.ViewModelType, Navigatio
                                 viewModel?.transitionToScreen(ConfirmationModal(info: info), transitionType: .present)
                             },
                             onImageTap: { [weak viewModel, dependencies = viewModel.dependencies] in
-                                guard !dependencies[singleton: .sessionProManager].currentUserIsCurrentlyPro else { return }
+                                guard !dependencies[singleton: .sessionProManager].currentUserIsCurrentlyPro else {
+                                    guard let info: ConfirmationModal.Info = viewModel?.updateDisplayNameModal(state: state) else {
+                                        return
+                                    }
+
+                                    viewModel?.transitionToScreen(ConfirmationModal(info: info), transitionType: .present)
+
+                                    return
+                                }
 
                                 let proCTAModalVariant: ProCTAModal.Variant = {
                                     switch state.threadInfo.variant {

Session/Home/HomeViewModel.swift

@@ -118,12 +118,16 @@ public class HomeViewModel: NavigatableStateHolder {
             dataCache.profile(for: userSessionId.hexString) ??
             Profile.defaultFor(userSessionId.hexString)
         }
+        let userProState: SessionPro.State
 
         @MainActor public func sections(viewModel: HomeViewModel) -> [SectionModel] {
             HomeViewModel.sections(state: self, viewModel: viewModel)
         }
 
-        public var observedKeys: Set<ObservableKey> {
+        public let observedKeys: Set<ObservableKey> = []
+        public func observedKeys(using dependencies: Dependencies) -> Set<ObservableKey> {
+            let sessionProManager: SessionProManagerType = dependencies[singleton: .sessionProManager]
+
             var result: Set<ObservableKey> = [
                 .appLifecycle(.willEnterForeground),
                 .databaseLifecycle(.resumed),
@@ -149,7 +153,8 @@ public class HomeViewModel: NavigatableStateHolder {
                 .updateScreen(HomeViewModel.self),
                 .feature(.versionDeprecationWarning),
                 .feature(.versionDeprecationMinimum),
-                .showDonationsCTAModal
+                .showDonationsCTAModal,
+                .currentUserProState(sessionProManager),
             ]
 
             result.insert(contentsOf: Set(itemCache.values.flatMap { $0.observedKeys }))
@@ -164,6 +169,7 @@ public class HomeViewModel: NavigatableStateHolder {
             showVersionSupportBanner: Bool
         ) -> State {
             let userSessionId: SessionId = dependencies[cache: .general].sessionId
+            let userProState: SessionPro.State = dependencies[singleton: .sessionProManager].currentUserCurrentProState
 
             return State(
                 viewState: .loading,
@@ -201,7 +207,8 @@ public class HomeViewModel: NavigatableStateHolder {
                 pendingAppReviewPromptState: appReviewPromptState,
                 appWasInstalledPriorToAppReviewRelease: appWasInstalledPriorToAppReviewRelease,
                 showVersionSupportBanner: showVersionSupportBanner,
-                showDonationsCTAModal: false
+                showDonationsCTAModal: false,
+                userProState: userProState
             )
         }
     }
@@ -232,6 +239,8 @@ public class HomeViewModel: NavigatableStateHolder {
         var showVersionSupportBanner: Bool = previousState.showVersionSupportBanner
         var showDonationsCTAModal: Bool = previousState.showDonationsCTAModal
 
+        var userProState: SessionPro.State = previousState.userProState
+
         /// Store a local copy of the events so we can manipulate it based on the state changes
         var eventsToProcess: [ObservedEvent] = events
 
@@ -463,6 +472,10 @@ public class HomeViewModel: NavigatableStateHolder {
                 using: dependencies
             )
         }
+
+        if let value = changes.latestGeneric(.currentUserProState, as: SessionPro.State.self) {
+            userProState = value
+        }
 
         /// Generate the new state
         return State(
@@ -486,7 +499,8 @@ public class HomeViewModel: NavigatableStateHolder {
             pendingAppReviewPromptState: pendingAppReviewPromptState,
             appWasInstalledPriorToAppReviewRelease: appWasInstalledPriorToAppReviewRelease,
             showVersionSupportBanner: showVersionSupportBanner,
-            showDonationsCTAModal: showDonationsCTAModal
+            showDonationsCTAModal: showDonationsCTAModal,
+            userProState: userProState
         )
     }
 
@@ -571,7 +585,13 @@ public class HomeViewModel: NavigatableStateHolder {
                 self?.transitionToScreen(viewController)
             },
             presenting: { [weak self, dependencies] modal in
-                dependencies[defaults: .standard, key: .hasShownProExpiringCTA] = true
+                switch info.variant {
+                    case .expiring(timeLeft: .some):
+                        dependencies[defaults: .standard, key: .hasShownProExpiringCTA] = true
+                    case .expiring(timeLeft: .none):
+                        dependencies[defaults: .standard, key: .hasShownProExpiredCTA] = true
+                    default: return
+                }
                 self?.transitionToScreen(modal, transitionType: .present)
             }
         )

Session/Media Viewing & Editing/MessageInfoScreen.swift

@@ -395,7 +395,7 @@ struct MessageInfoScreen: View {
                                             HStack(spacing: Values.smallSpacing) {
                                                 AttributedText(Lucide.Icon.circleCheck.attributedString(size: 17))
                                                     .font(.system(size: 17))
-                                                    .foregroundColor(themeColor: .primary)
+                                                    .foregroundColor(themeColor: .sessionButton_text)
 
                                                 Text(feature.title)
                                                     .font(.Body.largeRegular)

Session/Media Viewing & Editing/SendMediaNavigationController.swift

@@ -18,8 +18,7 @@ class SendMediaNavigationController: UINavigationController {
     static let bottomButtonsCenterOffset: CGFloat = -50
 
     private let dependencies: Dependencies
-    private let threadId: String
-    private let threadVariant: SessionThread.Variant
+    private let threadInfo: ConversationInfoViewModel
     private var quoteViewModel: QuoteViewModel?
     private let onQuoteCancelled: (() -> Void)?
     private var disposables: Set<AnyCancellable> = Set()
@@ -28,15 +27,13 @@ class SendMediaNavigationController: UINavigationController {
     // MARK: - Initialization
 
     init(
-        threadId: String,
-        threadVariant: SessionThread.Variant,
+        threadInfo: ConversationInfoViewModel,
         quoteViewModel: QuoteViewModel?,
         onQuoteCancelled: (() -> Void)?,
         using dependencies: Dependencies
     ) {
         self.dependencies = dependencies
-        self.threadId = threadId
-        self.threadVariant = threadVariant
+        self.threadInfo = threadInfo
         self.quoteViewModel = quoteViewModel
         self.onQuoteCancelled = onQuoteCancelled
 
@@ -94,15 +91,13 @@ class SendMediaNavigationController: UINavigationController {
     public weak var sendMediaNavDelegate: SendMediaNavDelegate?
 
     public class func showingCameraFirst(
-        threadId: String,
-        threadVariant: SessionThread.Variant,
+        threadInfo: ConversationInfoViewModel,
         quoteViewModel: QuoteViewModel?,
         onQuoteCancelled: (() -> Void)?,
         using dependencies: Dependencies
     ) -> SendMediaNavigationController {
         let navController: SendMediaNavigationController = SendMediaNavigationController(
-            threadId: threadId,
-            threadVariant: threadVariant,
+            threadInfo: threadInfo,
             quoteViewModel: quoteViewModel,
             onQuoteCancelled: onQuoteCancelled,
             using: dependencies
@@ -113,15 +108,13 @@ class SendMediaNavigationController: UINavigationController {
     }
 
     public class func showingMediaLibraryFirst(
-        threadId: String,
-        threadVariant: SessionThread.Variant,
+        threadInfo: ConversationInfoViewModel,
         quoteViewModel: QuoteViewModel?,
         onQuoteCancelled: (() -> Void)?,
         using dependencies: Dependencies
     ) -> SendMediaNavigationController {
         let navController: SendMediaNavigationController = SendMediaNavigationController(
-            threadId: threadId,
-            threadVariant: threadVariant,
+            threadInfo: threadInfo,
             quoteViewModel: quoteViewModel,
             onQuoteCancelled: onQuoteCancelled,
             using: dependencies
@@ -277,8 +270,7 @@ class SendMediaNavigationController: UINavigationController {
         let viewController: AttachmentApprovalViewController = AttachmentApprovalViewController(
             mode: .sharedNavigation,
             delegate: self,
-            threadId: self.threadId,
-            threadVariant: self.threadVariant,
+            threadInfo: self.threadInfo,
             attachments: self.attachments,
             messageText: sendMediaNavDelegate.sendMediaNavInitialMessageText(self),
             quoteViewModel: self.quoteViewModel,

Session/Settings/DeveloperSettings/DeveloperSettingsProViewModel.swift

@@ -1054,7 +1054,7 @@ class DeveloperSettingsProViewModel: SessionTableViewModel, NavigatableStateHold
 
             await dependencies.notify(
                 key: .proRevocationListUpdated,
-                value: Array<Network.SessionPro.RevocationItem>()
+                value: Array<RevocationItem>()
             )
         }
         catch {