From 5418df243d9c365ea3f37b56dae064fae4519451 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 16 Jan 2024 13:18:17 -0500
Subject: [PATCH 1/2] modal tests

---
 .../controllers/subscription_controller.dart  | 26 ++++++++++++-------
 .../subscription/subscription_options.dart    | 21 +++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart
index 7095321a9..4caf8b7a0 100644
--- a/lib/pangea/controllers/subscription_controller.dart
+++ b/lib/pangea/controllers/subscription_controller.dart
@@ -13,7 +13,7 @@ import 'package:fluffychat/pangea/network/requests.dart';
 import 'package:fluffychat/pangea/network/urls.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
-import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/pangea/widgets/subscription/subscription_paywall.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -147,17 +147,23 @@ class SubscriptionController extends BaseController {
       }
       if (!forceShow && isSubscribed) return;
       await showModalBottomSheet(
-        isScrollControlled: true,
-        useRootNavigator: !PlatformInfos.isMobile,
-        clipBehavior: Clip.hardEdge,
+        // isScrollControlled: true,
+        // useRootNavigator: !PlatformInfos.isMobile,
+        // clipBehavior: Clip.hardEdge,
         context: context,
-        constraints: BoxConstraints(
-          maxHeight: PlatformInfos.isMobile ? 600 : 480,
-        ),
-        builder: (_) => const SizedBox.shrink(),
-        // SubscriptionPaywall(
-        //   pangeaController: _pangeaController,
+        // constraints: BoxConstraints(
+        //   maxHeight: PlatformInfos.isMobile ? 600 : 480,
         // ),
+        builder: (_) {
+          try {
+            return SubscriptionPaywall(
+              pangeaController: _pangeaController,
+            );
+          } catch (err) {
+            print("error build modal bottom sheet: $err");
+            return const SizedBox.shrink();
+          }
+        },
       );
     } catch (e, s) {
       ErrorHandler.logError(e: e, s: s);
diff --git a/lib/pangea/widgets/subscription/subscription_options.dart b/lib/pangea/widgets/subscription/subscription_options.dart
index a26d451b7..4a182cca0 100644
--- a/lib/pangea/widgets/subscription/subscription_options.dart
+++ b/lib/pangea/widgets/subscription/subscription_options.dart
@@ -15,20 +15,19 @@ class SubscriptionOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Expanded(
+    return Expanded(
       child: Wrap(
         alignment: WrapAlignment.center,
         direction: Axis.horizontal,
-        children: [],
-        // pangeaController
-        //     .subscriptionController.subscription!.availableSubscriptions
-        //     .map(
-        //       (subscription) => SubscriptionCard(
-        //         subscription: subscription,
-        //         pangeaController: pangeaController,
-        //       ),
-        //     )
-        //     .toList(),
+        children: pangeaController
+            .subscriptionController.subscription!.availableSubscriptions
+            .map(
+              (subscription) => SubscriptionCard(
+                subscription: subscription,
+                pangeaController: pangeaController,
+              ),
+            )
+            .toList(),
       ),
     );
   }

From 60695c5907c10f7a4cf6b4c183d7ad3eef6808cd Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 16 Jan 2024 13:25:16 -0500
Subject: [PATCH 2/2] more modal tests

---
 lib/pangea/controllers/subscription_controller.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart
index 4caf8b7a0..8fea6461a 100644
--- a/lib/pangea/controllers/subscription_controller.dart
+++ b/lib/pangea/controllers/subscription_controller.dart
@@ -149,10 +149,10 @@ class SubscriptionController extends BaseController {
       await showModalBottomSheet(
         // isScrollControlled: true,
         // useRootNavigator: !PlatformInfos.isMobile,
-        // clipBehavior: Clip.hardEdge,
+        clipBehavior: Clip.hardEdge,
         context: context,
-        // constraints: BoxConstraints(
-        //   maxHeight: PlatformInfos.isMobile ? 600 : 480,
+        // constraints: const BoxConstraints(
+        //   maxHeight: 600,
         // ),
         builder: (_) {
           try {