Merge pull request 'PostHog last fixes hopefully' (#109) from SEND006 into main

Reviewed-on: #109

frontend/pweb/lib/pages/address_book/form/page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:collection/collection.dart';
@@ -14,6 +16,7 @@ import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pweb/pages/address_book/form/view.dart';
+import 'package:pweb/services/posthog.dart';
 import 'package:pweb/utils/error/snackbar.dart';
 import 'package:pweb/utils/payment/label.dart';
 import 'package:pweb/utils/snackbar.dart';
@@ -113,11 +116,11 @@ class _AddressBookRecipientFormState extends State<AddressBookRecipientForm> {
       return;
     }
 
-    // AmplitudeService.recipientAddCompleted(
-    //   _type,
-    //   _status,
-    //   _methods.keys.toSet(),
-    // );
+    unawaited(PosthogService.recipientAddCompleted(
+      _type,
+      _status,
+      _methods.keys.toSet(),
+    ));
     final recipient = await executeActionWithNotification(
       context: context, 
       action: _doSave, 

frontend/pweb/lib/pages/loaders/account.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
+import 'package:pshared/models/auth/state.dart';
 import 'package:pshared/provider/account.dart';
 
 import 'package:pweb/app/router/pages.dart';
@@ -10,26 +11,64 @@ import 'package:pweb/widgets/error/snackbar.dart';
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
-class AccountLoader extends StatelessWidget {
+class AccountLoader extends StatefulWidget {
   final Widget child;
-
   const AccountLoader({super.key, required this.child});
 
   @override
-  Widget build(BuildContext context) => Consumer<AccountProvider>(builder: (context, provider, _) {
-    if (provider.isLoading) return const Center(child: CircularProgressIndicator());
-    if (provider.error != null) {
-      postNotifyUserOfErrorX(
-        context: context, 
-        errorSituation: AppLocalizations.of(context)!.errorLogin, 
-        exception: provider.error!,
-      );
+  State<AccountLoader> createState() => _AccountLoaderState();
+}
+
+class _AccountLoaderState extends State<AccountLoader> {
+  AuthState? _handledState;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      Provider.of<AccountProvider>(context, listen: false).restoreIfPossible();
+    });
+  }
+
+  void _handleSideEffects(AccountProvider provider) {
+    if (_handledState == provider.authState) return;
+    _handledState = provider.authState;
+
+    void goToLogin() {
+      if (!mounted) return;
       navigateAndReplace(context, Pages.login);
     }
-    if (provider.account == null) {
-      WidgetsBinding.instance.addPostFrameCallback((_) => navigateAndReplace(context, Pages.login));
-      return const Center(child: CircularProgressIndicator());
+
+    switch (provider.authState) {
+      case AuthState.error:
+        final error = provider.error ?? Exception('Authorization failed');
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!mounted) return;
+          postNotifyUserOfErrorX(
+            context: context,
+            errorSituation: AppLocalizations.of(context)!.errorLogin,
+            exception: error,
+          );
+          goToLogin();
+        });
+        break;
+      case AuthState.empty:
+        WidgetsBinding.instance.addPostFrameCallback((_) => goToLogin());
+        break;
+      default:
+        break;
     }
-    return child;
-  });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AccountProvider>(builder: (context, provider, _) {
+      _handleSideEffects(provider);
+      if (provider.authState == AuthState.ready && provider.account != null) {
+        return widget.child;
+      }
+      return const Center(child: CircularProgressIndicator());
+    });
+  }
 }

frontend/pweb/lib/pages/loaders/organization.dart

@@ -4,9 +4,6 @@ import 'package:provider/provider.dart';
 
 import 'package:pshared/provider/organizations.dart';
 
-import 'package:pweb/app/router/pages.dart';
-import 'package:pweb/widgets/error/snackbar.dart';
-
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
@@ -19,12 +16,20 @@ class OrganizationLoader extends StatelessWidget {
   Widget build(BuildContext context) => Consumer<OrganizationsProvider>(builder: (context, provider, _) {
     if (provider.isLoading) return const Center(child: CircularProgressIndicator());
     if (provider.error != null) {
-      postNotifyUserOfErrorX(
-        context: context, 
-        errorSituation: AppLocalizations.of(context)!.errorLogin, 
-        exception: provider.error!,
+      final loc = AppLocalizations.of(context)!;
+      return Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(loc.errorLogin),
+            const SizedBox(height: 12),
+            ElevatedButton(
+              onPressed: provider.load,
+              child: Text(loc.retry),
+            ),
+          ],
+        ),
       );
-      navigateAndReplace(context, Pages.login);
     }
     if ((provider.error == null) && (!provider.isOrganizationSet)) {
       WidgetsBinding.instance.addPostFrameCallback((_) {

frontend/pweb/lib/pages/loaders/permissions.dart

@@ -5,36 +5,49 @@ import 'package:provider/provider.dart';
 import 'package:pshared/provider/account.dart';
 import 'package:pshared/provider/permissions.dart';
 
-import 'package:pweb/app/router/pages.dart';
-import 'package:pweb/widgets/error/snackbar.dart';
-
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
 class PermissionsLoader extends StatelessWidget {
   final Widget child;
-
   const PermissionsLoader({super.key, required this.child});
 
-  @override
-  Widget build(BuildContext context) => Consumer2<PermissionsProvider, AccountProvider>(builder: (context, provider, accountProvider, _) {
-    if (provider.isLoading) {
-      return const Center(child: CircularProgressIndicator());
-    }
-    if (provider.error != null) {
-      postNotifyUserOfErrorX(
-        context: context, 
-        errorSituation: AppLocalizations.of(context)!.errorLogin, 
-        exception: provider.error!,
-      );
-      navigateAndReplace(context, Pages.login);
-    }
-    if (provider.error == null && !provider.isReady && accountProvider.account != null) {
+  void _triggerLoadIfNeeded(PermissionsProvider provider) {
+    if (!provider.isLoading && !provider.isReady) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        provider.load();
+        if (!provider.isLoading && !provider.isReady) {
+          provider.load();
+        }
       });
-      return const Center(child: CircularProgressIndicator());
     }
-    return child;
-  });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer2<PermissionsProvider, AccountProvider>(
+      builder: (context, provider, _accountProvider, _) {
+        if (provider.error != null) {
+          final loc = AppLocalizations.of(context)!;
+          return Center(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(loc.errorLogin),
+                const SizedBox(height: 12),
+                ElevatedButton(
+                  onPressed: provider.load,
+                  child: Text(loc.retry),
+                ),
+              ],
+            ),
+          );
+        }
+        _triggerLoadIfNeeded(provider);
+        if (provider.isLoading || !provider.isReady) {
+          return const Center(child: CircularProgressIndicator());
+        }
+        return child;
+      },
+    );
+  }
 }

frontend/pweb/lib/pages/login/form.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
@@ -14,6 +16,7 @@ import 'package:pweb/widgets/password/password.dart';
 import 'package:pweb/widgets/username.dart';
 import 'package:pweb/widgets/vspacer.dart';
 import 'package:pweb/widgets/error/snackbar.dart';
+import 'package:pweb/services/posthog.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
@@ -43,6 +46,7 @@ class _LoginFormState extends State<LoginForm> {
         password: _passwordController.text,
         locale: context.read<LocaleProvider>().locale.languageCode,
       );
+      unawaited(PosthogService.login(pending: outcome.isPending));
       if (outcome.isPending) {
         // TODO: fix context usage
         navigateAndReplace(context, Pages.sfactor);

frontend/pweb/lib/pages/payment_methods/page.dart

@@ -16,6 +16,7 @@ import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/pages/payment_methods/payment_page/body.dart';
 import 'package:pweb/providers/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
+import 'package:pweb/services/posthog.dart';
 
 
 class PaymentPage extends StatefulWidget {
@@ -109,7 +110,7 @@ class _PaymentPageState extends State<PaymentPage> {
 
   void _handleSendPayment() {
     // TODO: Handle Payment logic
-    // AmplitudeService.paymentInitiated();
+    PosthogService.paymentInitiated(method: _flowProvider.selectedType);
   }
 
   @override
@@ -195,4 +196,4 @@ class _PaymentPageState extends State<PaymentPage> {
           (method.description?.contains(wallet.walletUserID) ?? false),
     );
   }
-}
+}

frontend/pweb/lib/pages/settings/profile/account/locale.dart

@@ -1,10 +1,12 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
 import 'package:pshared/provider/locale.dart';
 
-// import 'package:pweb/services/amplitude.dart';
+import 'package:pweb/services/posthog.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
@@ -58,7 +60,7 @@ class LocalePicker extends StatelessWidget {
                 onChanged: (locale) {
                   if (locale != null) {
                     localeProvider.setLocale(locale);
-                    // AmplitudeService.localeChanged(locale);
+                    unawaited(PosthogService.localeChanged(locale));
                   }
                 },
                 decoration: const InputDecoration(