diff --git a/lib/pangea/subscription/controllers/subscription_controller.dart b/lib/pangea/subscription/controllers/subscription_controller.dart index 4a1d6b3d7..6cb7829b5 100644 --- a/lib/pangea/subscription/controllers/subscription_controller.dart +++ b/lib/pangea/subscription/controllers/subscription_controller.dart @@ -221,11 +221,8 @@ class SubscriptionController extends BaseController { } } - int get _currentTrialDays => _userController.inTrialWindow(trialDays: 1) - ? 1 - : _userController.inTrialWindow(trialDays: 7) - ? 7 - : 0; + int get _currentTrialDays => + _userController.inTrialWindow(trialDays: 7) ? 7 : 0; bool get _activatedNewUserTrial => _userController.inTrialWindow(trialDays: 1) || diff --git a/lib/pangea/subscription/models/base_subscription_info.dart b/lib/pangea/subscription/models/base_subscription_info.dart index 745e36fbc..b784efd94 100644 --- a/lib/pangea/subscription/models/base_subscription_info.dart +++ b/lib/pangea/subscription/models/base_subscription_info.dart @@ -71,7 +71,9 @@ class CurrentSubscriptionInfo { void setTrial(DateTime expiration) { expirationDate = expiration; currentSubscriptionId = AppConfig.trialSubscriptionId; - if (currentSubscription == null) { + if (currentSubscription == null && + !availableSubscriptionInfo.availableSubscriptions + .any((sub) => sub.isTrial)) { availableSubscriptionInfo.availableSubscriptions.add( SubscriptionDetails( price: 0, diff --git a/lib/pangea/subscription/widgets/subscription_buttons.dart b/lib/pangea/subscription/widgets/subscription_buttons.dart index ea31e5da8..ff59c467c 100644 --- a/lib/pangea/subscription/widgets/subscription_buttons.dart +++ b/lib/pangea/subscription/widgets/subscription_buttons.dart @@ -30,11 +30,9 @@ class SubscriptionButtons extends StatelessWidget { return Column( children: [ ListTile( - title: subscription.isTrial - ? Text(L10n.of(context).oneWeekTrial) - : Text( - subscription.displayName(context), - ), + title: Text( + subscription.displayName(context), + ), subtitle: Text( subscription.isTrial && !inTrialWindow ? L10n.of(context).trialPeriodExpired diff --git a/lib/pangea/subscription/widgets/subscription_options.dart b/lib/pangea/subscription/widgets/subscription_options.dart index 040b6d931..279fd6f5e 100644 --- a/lib/pangea/subscription/widgets/subscription_options.dart +++ b/lib/pangea/subscription/widgets/subscription_options.dart @@ -50,9 +50,7 @@ class SubscriptionOptions extends StatelessWidget { context, ); }, - title: subscription.isTrial - ? L10n.of(context).oneWeekTrial - : subscription.displayName(context), + title: subscription.displayName(context), enabled: !subscription.isTrial, description: subscription.isTrial ? L10n.of(context).trialPeriodExpired