IOS-2594 Update middleware

anyproto · Apr 8, 2024 · 904b474 · 904b474
1 parent 29f0602
commit 904b474
Show file tree

Hide file tree

Showing 12 changed files with 767 additions and 229 deletions.
diff --git a/Anytype/Generated/Strings.swift b/Anytype/Generated/Strings.swift
@@ -1573,16 +1573,12 @@ internal enum Loc {
     internal enum Payment {
       /// Apple subscription
       internal static let appleSubscription = Loc.tr("Localizable", "Membership.Payment.Apple subscription", fallback: "Apple subscription")
-      /// ApplePay
-      internal static let applePay = Loc.tr("Localizable", "Membership.Payment.ApplePay", fallback: "ApplePay")
       /// Card
       internal static let card = Loc.tr("Localizable", "Membership.Payment.Card", fallback: "Card")
       /// Crypto
       internal static let crypto = Loc.tr("Localizable", "Membership.Payment.Crypto", fallback: "Crypto")
       /// Google subscription
       internal static let googleSubscription = Loc.tr("Localizable", "Membership.Payment.Google subscription", fallback: "Google subscription")
-      /// GooglePay
-      internal static let googlePay = Loc.tr("Localizable", "Membership.Payment.GooglePay", fallback: "GooglePay")
     }
     internal enum Success {
       /// Big cheers for your curiosity!

diff --git a/Anytype/Resources/Strings/en.lproj/Localizable.strings b/Anytype/Resources/Strings/en.lproj/Localizable.strings
@@ -1108,8 +1108,6 @@
 
 "Membership.Payment.Card" = "Card";
 "Membership.Payment.Crypto" = "Crypto";
-"Membership.Payment.ApplePay" = "ApplePay";
-"Membership.Payment.GooglePay" = "GooglePay";
 "Membership.Payment.Apple subscription" = "Apple subscription";
 "Membership.Payment.Google subscription" = "Google subscription";
 

diff --git a/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipStatusExtension.swift b/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipStatusExtension.swift
@@ -28,15 +28,11 @@ public extension MembershipStatus {
             Loc.Membership.Payment.card
         case .methodCrypto:
             Loc.Membership.Payment.crypto
-        case .methodApplePay:
-            Loc.Membership.Payment.applePay
-        case .methodGooglePay:
-            Loc.Membership.Payment.googlePay
-        case .methodAppleInapp:
+        case .methodInappApple:
             Loc.Membership.Payment.appleSubscription
-        case .methodGoogleInapp:
+        case .methodInappGoogle:
             Loc.Membership.Payment.googleSubscription
-        case .UNRECOGNIZED:
+        case .UNRECOGNIZED, .methodNone:
             nil
         }
     }

diff --git a/...esentationLayer/Modules/Membership/TierSelection/Views/MembershipOwnerInfoSheetView.swift b/...esentationLayer/Modules/Membership/TierSelection/Views/MembershipOwnerInfoSheetView.swift
@@ -77,7 +77,7 @@ struct MembershipOwnerInfoSheetView: View {
                     tier: .mockCoCreator,
                     status: .active,
                     dateEnds: .tomorrow,
-                    paymentMethod: .methodAppleInapp,
+                    paymentMethod: .methodInappApple,
                     anyName: ""
                 )
             )

diff --git a/Libraryfile b/Libraryfile
@@ -1 +1 @@
-MIDDLE_VERSION=v0.33.0-rc8
+MIDDLE_VERSION=v0.33.0-rc10
diff --git a/Modules/ProtobufMessages/Sources/Generated/commands+invocation.swift b/Modules/ProtobufMessages/Sources/Generated/commands+invocation.swift
@@ -711,6 +711,11 @@ extension Anytype_Rpc.Membership.GetVerificationEmail.Response.Error: ResponseEr
     public var isNull: Bool { code == .null && description_p.isEmpty }
 }
 
+extension Anytype_Rpc.Membership.GetVerificationEmailStatus.Response: ResultWithError {}
+extension Anytype_Rpc.Membership.GetVerificationEmailStatus.Response.Error: ResponseError {
+    public var isNull: Bool { code == .null && description_p.isEmpty }
+}
+
 extension Anytype_Rpc.Membership.IsNameValid.Response: ResultWithError {}
 extension Anytype_Rpc.Membership.IsNameValid.Response.Error: ResponseError {
     public var isNull: Bool { code == .null && description_p.isEmpty }

diff --git a/Modules/ProtobufMessages/Sources/Generated/service+invocation.swift b/Modules/ProtobufMessages/Sources/Generated/service+invocation.swift
@@ -2304,6 +2304,16 @@ public struct ClientCommands {
         }
     }
 
+    public static func membershipGetVerificationEmailStatus(
+        _ request:  Anytype_Rpc.Membership.GetVerificationEmailStatus.Request = .init()
+    ) -> Invocation< Anytype_Rpc.Membership.GetVerificationEmailStatus.Request, Anytype_Rpc.Membership.GetVerificationEmailStatus.Response> {
+        return Invocation(messageName: "MembershipGetVerificationEmailStatus", request: request) { request in
+            let requestData = try request.serializedData()
+            let responseData = Lib.ServiceMembershipGetVerificationEmailStatus(requestData) ?? Data()
+            return try Anytype_Rpc.Membership.GetVerificationEmailStatus.Response(serializedData: responseData)
+        }
+    }
+
     public static func membershipGetVerificationEmail(
         _ request: Anytype_Rpc.Membership.GetVerificationEmail.Request = .init()
     ) -> Invocation<Anytype_Rpc.Membership.GetVerificationEmail.Request, Anytype_Rpc.Membership.GetVerificationEmail.Response> {