major

airqo-platform · Jan 26, 2024 · b395fa0 · b395fa0
1 parent 555a14a
commit b395fa0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/mobile/lib/screens/dashboard/dashboard_view.dart b/mobile/lib/screens/dashboard/dashboard_view.dart
@@ -5,14 +5,12 @@ import 'package:app/blocs/blocs.dart';
 import 'package:app/constants/constants.dart';
 import 'package:app/models/models.dart';
 import 'package:app/screens/analytics/analytics_widgets.dart';
-import 'package:app/screens/email_link/email_link_page.dart';
 import 'package:app/screens/quiz/quiz_view.dart';
 import 'package:app/services/services.dart';
 import 'package:app/themes/theme.dart';
 import 'package:app/utils/utils.dart';
 import 'package:app/widgets/widgets.dart';
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -527,17 +525,6 @@ class _DashboardViewState extends State<DashboardView>
     _refresh();
     _updateWidget();
     NotificationService.requestNotification(context, "dashboard");
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final user = await CloudStore.getProfile();
-      if (user.phoneNumber != "" && user.analyticsMongoID == "") {
-        await Future.delayed(const Duration(milliseconds: 1000))
-            .then((_) async {
-          if (mounted) {
-            await bottomSheetEmailLink(context);
-          }
-        });
-      }
-    });
   }
 
   @override

diff --git a/mobile/lib/screens/email_link/email_link_page.dart b/mobile/lib/screens/email_link/email_link_page.dart
@@ -161,10 +161,10 @@ Future<dynamic> bottomSheetEmailLink(BuildContext context) async {
                       InkWell(
                         onTap: () async {
                           Navigator.pop(context, false);
-                          // prefs.setInt(
-                          //   'remindMeLaterTimestamp',
-                          //   DateTime.now().millisecondsSinceEpoch,
-                          // );
+                          prefs.setInt(
+                            'remindMeLaterTimestamp',
+                            DateTime.now().millisecondsSinceEpoch,
+                          );
                         },
                         child: const EmailLinkSkipButton(
                           text: "Remind me later",

diff --git a/mobile/lib/screens/home_page.dart b/mobile/lib/screens/home_page.dart
@@ -12,6 +12,7 @@ import 'package:app/themes/theme.dart';
 import 'package:app/utils/utils.dart';
 import 'package:app/widgets/custom_widgets.dart';
 import 'package:app/widgets/dialogs.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -242,10 +243,19 @@ class _HomePageState extends State<HomePage> {
         });
       }
     });
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      Future.delayed(Duration(milliseconds: 500), () {
-        showEmailLinkBottomSheet(context);
-      });
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final user = FirebaseAuth.instance.currentUser;
+      if ((user != null && user.phoneNumber != null)) {
+        if (user.email != null) {
+          return;
+        } else if (user.isAnonymous) {
+          return;
+        }
+        await Future.delayed(const Duration(seconds: 2));
+        if (mounted) {
+          await bottomSheetEmailLink(context);
+        }
+      }
     });
   }