diff --git a/lib/ui/payment/subscription.dart b/lib/ui/payment/subscription.dart index 067a3ae10..0327c3ab5 100644 --- a/lib/ui/payment/subscription.dart +++ b/lib/ui/payment/subscription.dart @@ -1,4 +1,5 @@ import 'package:flutter/cupertino.dart'; +import 'package:photos/core/configuration.dart'; import 'package:photos/services/feature_flag_service.dart'; import 'package:photos/services/update_service.dart'; import "package:photos/ui/payment/store_subscription_page.dart"; @@ -8,9 +9,18 @@ StatefulWidget getSubscriptionPage({bool isOnBoarding = false}) { if (UpdateService.instance.isIndependentFlavor()) { return StripeSubscriptionPage(isOnboarding: isOnBoarding); } - if (FeatureFlagService.instance.enableStripe()) { + if (FeatureFlagService.instance.enableStripe() && + _isUserCreatedPostStripeSupport()) { return StripeSubscriptionPage(isOnboarding: isOnBoarding); } else { return StoreSubscriptionPage(isOnboarding: isOnBoarding); } } + +// return true if the user was created after we added support for stripe payment +// on frame. We do this check to avoid showing Stripe payment option for earlier +// users who might have paid via playStore. This method should be removed once +// we have better handling for active play/app store subscription & stripe plans. +bool _isUserCreatedPostStripeSupport() { + return Configuration.instance.getUserID()! > 1580559962386460; +} diff --git a/pubspec.yaml b/pubspec.yaml index 66ffe2de7..fc7c0a926 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ description: ente photos application # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.8.62+582 +version: 0.8.63+583 environment: sdk: ">=3.0.0 <4.0.0"