From 50837194b2d23055aadaaea3eec8d459fea22ca2 Mon Sep 17 00:00:00 2001
From: Brord van Wierst <brordvwierst@gmail.com>
Date: Mon, 5 May 2025 19:49:03 +0200
Subject: [PATCH] fix: reverse order for subscription display (#2647)

* 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>
---
 .env                                          |  1 -
 .../controllers/subscription_controller.dart  |  1 -
 .../pages/settings_subscription_view.dart     | 21 +++++++------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index 8a6acb7a4..1d4a8027e 100644
--- a/.env
+++ b/.env
@@ -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'
diff --git a/lib/pangea/subscription/controllers/subscription_controller.dart b/lib/pangea/subscription/controllers/subscription_controller.dart
index f23a8d736..fc9aedf75 100644
--- a/lib/pangea/subscription/controllers/subscription_controller.dart
+++ b/lib/pangea/subscription/controllers/subscription_controller.dart
@@ -186,7 +186,6 @@ class SubscriptionController extends BaseController {
       if (selectedSubscription.isTrial) {
         try {
           await activateNewUserTrial();
-          await updateCustomerInfo();
         } catch (e) {
           debugPrint("Failed to initialize trial subscription");
         }
diff --git a/lib/pangea/subscription/pages/settings_subscription_view.dart b/lib/pangea/subscription/pages/settings_subscription_view.dart
index 1928454b9..5601c1d4a 100644
--- a/lib/pangea/subscription/pages/settings_subscription_view.dart
+++ b/lib/pangea/subscription/pages/settings_subscription_view.dart
@@ -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;
     }