Merge pull request #38 from pangeachat/freezing-fix

more testing
pangeachat · Jan 16, 2024 · 39416ba · 39416ba
2 parents 2b7ea2c + 96cda44
commit 39416ba
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 49 deletions.
diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart
@@ -156,16 +156,10 @@ class SubscriptionController extends BaseController {
           maxHeight: 600,
         ),
         builder: (_) {
-          // try {
           return SubscriptionPaywall(
             pangeaController: _pangeaController,
           );
-          // } catch (err) {
-          //   print("error build modal bottom sheet: $err");
-          //   return const SizedBox.shrink();
-          // }
         },
-        // builder: (_) => const SizedBox.shrink(),
       );
     } catch (e, s) {
       ErrorHandler.logError(e: e, s: s);

diff --git a/lib/pangea/widgets/subscription/subscription_paywall.dart b/lib/pangea/widgets/subscription/subscription_paywall.dart
@@ -1,12 +1,9 @@
 // Flutter imports:
 
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/widgets/subscription/subscription_options.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 class SubscriptionPaywall extends StatelessWidget {
   final PangeaController pangeaController;
@@ -17,45 +14,45 @@ class SubscriptionPaywall extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        centerTitle: true,
-        leading: CloseButton(onPressed: Navigator.of(context).pop),
-        title: Text(
-          L10n.of(context)!.getAccess,
-          style: const TextStyle(
-            fontSize: 20,
-          ),
-          textAlign: TextAlign.center,
-        ),
-      ),
+    return const Scaffold(
+      // appBar: AppBar(
+      //   centerTitle: true,
+      //   leading: CloseButton(onPressed: Navigator.of(context).pop),
+      //   title: Text(
+      //     L10n.of(context)!.getAccess,
+      //     style: const TextStyle(
+      //       fontSize: 20,
+      //     ),
+      //     textAlign: TextAlign.center,
+      //   ),
+      // ),
       body: Padding(
-        padding: const EdgeInsets.all(20),
-        child: ListView(
-          children: [
-            if (pangeaController.matrixState.client.rooms.length > 1) ...[
-              Text(
-                L10n.of(context)!.welcomeBack,
-                textAlign: TextAlign.center,
-                style: const TextStyle(fontSize: 16),
-              ),
-              const SizedBox(height: 20),
-            ],
-            Text(
-              L10n.of(context)!.subscriptionDesc,
-              textAlign: TextAlign.center,
-              style: const TextStyle(fontSize: 16),
-            ),
-            const SizedBox(height: 20),
-            pangeaController.userController.inTrialWindow
-                ? FreeTrialCard(
-                    pangeaController: pangeaController,
-                  )
-                : SubscriptionOptions(
-                    pangeaController: pangeaController,
-                  ),
-          ],
-        ),
+        padding: EdgeInsets.all(20),
+        // child: ListView(
+        //   children: [
+        //     if (pangeaController.matrixState.client.rooms.length > 1) ...[
+        //       Text(
+        //         L10n.of(context)!.welcomeBack,
+        //         textAlign: TextAlign.center,
+        //         style: const TextStyle(fontSize: 16),
+        //       ),
+        //       const SizedBox(height: 20),
+        //     ],
+        //     Text(
+        //       L10n.of(context)!.subscriptionDesc,
+        //       textAlign: TextAlign.center,
+        //       style: const TextStyle(fontSize: 16),
+        //     ),
+        //     const SizedBox(height: 20),
+        //     pangeaController.userController.inTrialWindow
+        //         ? FreeTrialCard(
+        //             pangeaController: pangeaController,
+        //           )
+        //         : SubscriptionOptions(
+        //             pangeaController: pangeaController,
+        //           ),
+        //   ],
+        // ),
       ),
     );
   }