Skip to content

Session Pro Backend Integration 2#660

Merged
mpretty-cyro merged 144 commits intosession-foundation:devfrom
RyanRory:session-pro-backend-integration-2
Apr 1, 2026
Merged

Session Pro Backend Integration 2#660
mpretty-cyro merged 144 commits intosession-foundation:devfrom
RyanRory:session-pro-backend-integration-2

Conversation

@RyanRory
Copy link
Copy Markdown
Collaborator

@RyanRory RyanRory commented Feb 4, 2026

No description provided.

@RyanRory RyanRory requested a review from mpretty-cyro February 4, 2026 03:22
@RyanRory RyanRory added enhancement New feature or request Jira This ticket is being tracked in Jira labels Feb 4, 2026
@RyanRory RyanRory self-assigned this Feb 4, 2026
@RyanRory RyanRory requested a review from mpretty-cyro February 5, 2026 00:50
@RyanRory RyanRory requested a review from mpretty-cyro February 5, 2026 01:04
Ryan ZHAO and others added 28 commits March 16, 2026 13:54
… are not auto enabled first time buying pro
…integration-2

# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/HomeViewModel.swift
#	Session/Onboarding/LandingScreen.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/UIContextualAction+Utilities.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
#	SessionMessagingKit/SessionPro/SessionProManager.swift
#	SessionMessagingKit/Types/ConversationInfoViewModel.swift
#	SessionUIKit/Components/SwiftUI/DonationCTAModal.swift
#	SessionUIKit/Components/SwiftUI/Modal+SwiftUI.swift
#	SessionUIKit/Components/SwiftUI/ProCTAModal.swift
#	SessionUIKit/Screens/SessionListScreen/ListItemViews/SessionListScreen+ListItemProfilePicture.swift
#	SessionUIKit/Screens/SessionListScreen/SessionListScreen.swift
#	SessionUIKit/Style Guide/Themes/SwiftUI+Theme.swift
#	SessionUtilitiesKit/Database/Models/KeyValueStore.swift
@mpretty-cyro mpretty-cyro merged commit bb00c2d into session-foundation:dev Apr 1, 2026
@mpretty-cyro mpretty-cyro mentioned this pull request Apr 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request Jira This ticket is being tracked in Jira

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants