ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: reverse order for subscription display (#2647)

Browse source 
* reverse order for subscription display

* generated

* removedunneeded update and old BASE_API

* generated

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Brord van Wierst 2025-05-05 19:49:03 +02:00 • committed by GitHub
parent 37e3e9793d
commit 50837194b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env
View file

@ -1,4 +1,3 @@
BASE_API='https://api.staging.pangea.chat/api/v1'
CHOREO_API = 'https://api.staging.pangea.chat'
FRONTEND_URL='https://app.staging.pangea.chat'
SYNAPSE_URL = 'matrix.staging.pangea.chat'

1
lib/pangea/subscription/controllers/subscription_controller.dart
View file

@ -186,7 +186,6 @@ class SubscriptionController extends BaseController {
if (selectedSubscription.isTrial) {
try {
await activateNewUserTrial();
await updateCustomerInfo();
} catch (e) {
debugPrint("Failed to initialize trial subscription");
}

21
lib/pangea/subscription/pages/settings_subscription_view.dart
View file

@ -100,13 +100,16 @@ class ManagementNotAvailableWarning extends StatelessWidget {
controller.subscriptionController.currentSubscriptionInfo;
String getWarningText() {
final DateFormat formatter = DateFormat('yyyy-MM-dd');
if (controller.currentSubscriptionIsTrial) {
return L10n.of(context).trialExpiration(
if (controller.currentSubscriptionIsPromotional) {
if (currentSubscriptionInfo?.isLifetimeSubscription ?? false) {
return L10n.of(context).promotionalSubscriptionDesc;
}
final DateFormat formatter = DateFormat('yyyy-MM-dd');
return L10n.of(context).promoSubscriptionExpirationDesc(
formatter.format(currentSubscriptionInfo!.expirationDate!),
);
}
if (controller.currentSubscriptionAvailable) {
String warningText = L10n.of(context).subsciptionPlatformTooltip;
if (controller.purchasePlatformDisplayName != null) {
@ -115,16 +118,6 @@ class ManagementNotAvailableWarning extends StatelessWidget {
}
return warningText;
}
if (controller.currentSubscriptionIsPromotional) {
if (currentSubscriptionInfo?.isLifetimeSubscription ?? false) {
return L10n.of(context).promotionalSubscriptionDesc;
}
return L10n.of(context).promoSubscriptionExpirationDesc(
formatter.format(currentSubscriptionInfo!.expirationDate!),
);
}
return L10n.of(context).subscriptionManagementUnavailable;
}