Merge pull request #42 from pangeachat/freezing-fix

removed expanded widget

lib/pangea/controllers/subscription_controller.dart

@@ -152,8 +152,8 @@ class SubscriptionController extends BaseController {
         useRootNavigator: !PlatformInfos.isMobile,
         clipBehavior: Clip.hardEdge,
         context: context,
-        constraints: const BoxConstraints(
+        constraints: BoxConstraints(
-          maxHeight: 600,
+          maxHeight: PlatformInfos.isMobile ? 600 : 450,
         ),
         builder: (_) {
           return SubscriptionPaywall(

lib/pangea/widgets/subscription/subscription_options.dart

@@ -15,21 +15,18 @@ class SubscriptionOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Expanded(
+    return Wrap(
-      child: Wrap(
       alignment: WrapAlignment.center,
       direction: Axis.horizontal,
-        children: [],
+      children: pangeaController
-        // children: pangeaController
+          .subscriptionController.subscription!.availableSubscriptions
-        //     .subscriptionController.subscription!.availableSubscriptions
+          .map(
-        //     .map(
+            (subscription) => SubscriptionCard(
-        //       (subscription) => SubscriptionCard(
+              subscription: subscription,
-        //         subscription: subscription,
+              pangeaController: pangeaController,
-        //         pangeaController: pangeaController,
-        //       ),
-        //     )
-        //     .toList(),
             ),
+          )
+          .toList(),
     );
   }
 }

lib/pangea/widgets/subscription/subscription_paywall.dart

@@ -31,14 +31,14 @@ class SubscriptionPaywall extends StatelessWidget {
         padding: const EdgeInsets.all(20),
         child: ListView(
           children: [
-            //     if (pangeaController.matrixState.client.rooms.length > 1) ...[
+            if (pangeaController.matrixState.client.rooms.length > 1) ...[
-            //       Text(
+              Text(
-            //         L10n.of(context)!.welcomeBack,
+                L10n.of(context)!.welcomeBack,
-            //         textAlign: TextAlign.center,
+                textAlign: TextAlign.center,
-            //         style: const TextStyle(fontSize: 16),
+                style: const TextStyle(fontSize: 16),
-            //       ),
+              ),
-            //       const SizedBox(height: 20),
+              const SizedBox(height: 20),
-            //     ],
+            ],
             Text(
               L10n.of(context)!.subscriptionDesc,
               textAlign: TextAlign.center,