Merge pull request #1575 from anyproto/release-to-dev

Release to dev
anyproto · Jun 6, 2024 · 6da5987 · 6da5987
2 parents 1c7ddf9 + bca19d8
commit 6da5987
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/...ype/Sources/PresentationLayer/Modules/Membership/InitialScreen/MembershipModuleView.swift b/...ype/Sources/PresentationLayer/Modules/Membership/InitialScreen/MembershipModuleView.swift
@@ -2,6 +2,7 @@ import SwiftUI
 import StoreKit
 import Services
 import Combine
+import AnytypeCore
 
 
 struct MembershipModuleView: View {
@@ -92,8 +93,10 @@ struct MembershipModuleView: View {
             }
 
             Spacer.fixedHeight(32)
-            contactUs
-            Spacer.fixedHeight(24)
+            if !FeatureFlags.hideCoCreator {
+                contactUs
+                Spacer.fixedHeight(24)
+            }
             restorePurchases
         }
     }

diff --git a/Anytype/Sources/ServiceLayer/Auth/LoginStateService.swift b/Anytype/Sources/ServiceLayer/Auth/LoginStateService.swift
@@ -72,8 +72,11 @@ final class LoginStateService: LoginStateServiceProtocol {
         await accountParticipantsStorage.startSubscription()
         await activeSpaceParticipantStorage.startSubscription()
         await participantSpacesStorage.startSubscription()
-        await membershipStatusStorage.startSubscription()
         storeKitService.startListenForTransactions()
+
+        Task {
+            await membershipStatusStorage.startSubscription()
+        }
     }
 
     private func stopSubscriptions() async {

diff --git a/Anytype/Sources/ServiceLayer/MembershipTierInfoProvider/MembershipMetadataProvider.swift b/Anytype/Sources/ServiceLayer/MembershipTierInfoProvider/MembershipMetadataProvider.swift
@@ -7,7 +7,7 @@ protocol MembershipMetadataProviderProtocol {
     func owningState(tier: MembershipTier) async -> MembershipTierOwningState
 
     func purchaseType(status: MembershipStatus) async -> MembershipPurchaseType
-    func purchaseAvailablitiy(tier: MembershipTier) async -> MembershipPurchaseAvailablitiy
+    func purchaseAvailablitiy(tier: MembershipTier, status: MembershipStatus) async -> MembershipPurchaseAvailablitiy
 }
 
 final class MembershipMetadataProvider: MembershipMetadataProviderProtocol {
@@ -28,7 +28,7 @@ final class MembershipMetadataProvider: MembershipMetadataProviderProtocol {
             }
         }
 
-        let purchaseAvailablitiy = await purchaseAvailablitiy(tier: tier)
+        let purchaseAvailablitiy = await purchaseAvailablitiy(tier: tier, status: status)
         return .unowned(purchaseAvailablitiy)
     }
 
@@ -50,7 +50,7 @@ final class MembershipMetadataProvider: MembershipMetadataProviderProtocol {
         }
     }
 
-    func purchaseAvailablitiy(tier: MembershipTier) async -> MembershipPurchaseAvailablitiy {
+    func purchaseAvailablitiy(tier: MembershipTier, status: MembershipStatus) async -> MembershipPurchaseAvailablitiy {
         switch tier.paymentType {
         case .appStore(let info):
             return await appStoreAvailability(info: info)
@@ -59,7 +59,10 @@ final class MembershipMetadataProvider: MembershipMetadataProviderProtocol {
         case nil:
             anytypeAssertionFailure(
                 "No payment type for unowned tier",
-                info: ["Tier": String(reflecting: tier)]
+                info: [
+                    "Tier": String(reflecting: tier),
+                    "Status": String(reflecting: status)
+                ]
             )
             return .external(url: URL(string: AboutApp.pricingLink)!)
         }

diff --git a/Modules/Services/Sources/Services/Membership/MembershipModelBuilder.swift b/Modules/Services/Sources/Services/Membership/MembershipModelBuilder.swift
@@ -123,8 +123,7 @@ final class MembershipModelBuilder: MembershipModelBuilderProtocol {
     }
 
     private func buildPaymentUrl(tier: Anytype_Model_MembershipTierData) -> URL {
-        // TODO: Uncomment when middleware is ready
-//        anytypeAssert(tier.iosManageURL.isNotEmpty, "Empty iosManageURL", info: ["tier": tier.debugDescription])
+        anytypeAssert(tier.iosManageURL.isNotEmpty, "Empty iosManageURL", info: ["tier": tier.debugDescription])
 
         return URL(string: tier.iosManageURL) ?? URL(string: "https://anytype.io/pricing")!
     }