Reminder For Merging Email and Phone number in the profile section

mobile/lib/l10n/app_en.arb

@@ -363,6 +363,9 @@
     "youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe" :" You would be required to add your email to your profile on the mobile app to enable you access the ",
     "withOneAccount":" with one account.",
     "addMyEmail":"Add my email",
-    "remindMeLater":"Remind me later"
-
-}
+    "remindMeLater":"Remind me later",
+    "addMyEmailToMyProfile":"Add my email to my profile",
+    "addYourEmailToYourProfileToEnableYouToAccessThe" : "Add your email to your profile to enable you to access the ",
+    "accessDeeperAirQualityInsights":"Access deeper Air Quality insights",
+    "usingYourAirQoMobileAppAccount":"using your AirQo mobile app account"
+    }

mobile/lib/l10n/app_fr.arb

@@ -353,5 +353,9 @@
   "youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe" : " Vous devrez ajouter votre e-mail à votre profil sur l'application mobile pour vous permettre d'accéder au ",
   "withOneAccount":" avec un compte.",
   "addMyEmail":"ajouter mon e-mail",
-  "remindMeLater":"Rappelez-moi plus tard"
+  "remindMeLater":"Rappelez-moi plus tard",
+  "addMyEmailToMyProfile":"Ajoutez mon e-mail à mon profil",
+  "addYourEmailToYourProfileToEnableYouToAccessThe" : "Ajoutez votre e-mail à votre profil pour vous permettre d'accéder au ",
+  "accessDeeperAirQualityInsights":"Accéder à des informations plus approfondies sur la qualité de l'air",
+  "usingYourAirQoMobileAppAccount":"En utilisant votre compte AirQo Mobile App"
 }

mobile/lib/l10n/app_lg.arb

@@ -355,6 +355,9 @@
     "youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe":" Wandibadde weetaaga okwongera email yo ku profile yo ku app y'essimu okukusobozesa okuyingira mu ",
     "withOneAccount":" nga erina akawunti emu.",
     "addMyEmail":"Yongerako email yange",
-    "remindMeLater":"Nzijukiza oluvannyuma"
-
+    "remindMeLater":"Nzijukiza oluvannyuma",
+    "addMyEmailToMyProfile":"Yongerako email yange ku profile yange",
+    "addYourEmailToYourProfileToEnableYouToAccessThe" : "Yongerako email yo ku profile yo okukusobozesa okuyingira mu ",
+    "accessDeeperAirQualityInsights":"okwekenenya okw'omutindo gw'empewo",
+    "usingYourAirQoMobileAppAccount":"okuva ku akawunti yo ku app ya AirQo"
 }

mobile/lib/l10n/app_pt.arb

@@ -353,5 +353,9 @@
     "youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe":" Você deverá adicionar seu e-mail ao seu perfil no aplicativo móvel para permitir o acesso ao ",
     "withOneAccount":" com uma conta.",
     "addMyEmail":"Adicionar meu e-mail",
-    "remindMeLater":"Lembre-me mais tarde"
+    "remindMeLater":"Lembre-me mais tarde",
+	"addMyEmailToMyProfile":"Adicionar meu e-mail ao meu perfil",
+    "addYourEmailToYourProfileToEnableYouToAccessThe" : "Adicione seu e-mail ao seu perfil para permitir o acesso ao ",
+    "accessDeeperAirQualityInsights":"acesso a insights mais profundos sobre a qualidade do ar",
+    "usingYourAirQoMobileAppAccount":"Usando sua conta do aplicativo móvel AirQo"
 	}

mobile/lib/l10n/app_sw.arb

@@ -354,5 +354,9 @@
     "youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe":" Utahitajika kuongeza barua pepe yako kwenye wasifu wako kwenye programu ya simu ili kukuwezesha kufikia ",
     "withOneAccount":" na akaunti moja.",
     "addMyEmail":"Ongeza barua pepe yangu",
-    "remindMeLater":"Nikumbushe baadaye"
+    "remindMeLater":"Nikumbushe baadaye",
+    "addMyEmailToMyProfile":"Ongeza barua pepe yangu kwenye wasifu wangu",
+    "addYourEmailToYourProfileToEnableYouToAccessThe" : "Ongeza barua pepe yako kwenye wasifu wako ili uweze kufikia ",
+    "accessDeeperAirQualityInsights":"fikia maelezo zaidi ya ubora wa hewa",
+    "usingYourAirQoMobileAppAccount":"Kwa kutumia akaunti yako ya programu ya simu ya AirQo"
 }

mobile/lib/screens/email_link/email_link_page.dart

@@ -17,7 +17,7 @@
   bool shouldShowBottomSheet = true;
   int remindMeLaterTimestamp = prefs.getInt('remindMeLaterTimestamp') ?? 0;
 
-  if (remindMeLaterTimestamp > 0) {
+  if (remindMeLaterTimestamp > 3) {
     DateTime lastRemindTimestamp =
         DateTime.fromMillisecondsSinceEpoch(remindMeLaterTimestamp);
     DateTime now = DateTime.now();
@@ -84,7 +84,8 @@
                         width: 295.53,
                         height: 67,
                         child: AutoSizeText(
-                          AppLocalizations.of(context)!.weAreShufflingThingsAroundForYou,
+                          AppLocalizations.of(context)!
+                              .weAreShufflingThingsAroundForYou,
                           textAlign: TextAlign.center,
                           style: TextStyle(
                             color: CustomColors.quizColorBlack,
@@ -101,8 +102,9 @@
                           textAlign: TextAlign.center,
                           text: TextSpan(
                             children: [
-                               TextSpan(
-                                text:AppLocalizations.of(context)!.youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe,
+                              TextSpan(
+                                text: AppLocalizations.of(context)!
+                                    .youWouldBeRequiredToAddYourEmailToYourProfileOnTheMobileAppToEnableYouAccessThe,
                                 style: const TextStyle(
                                   color: Color(0xFF485972),
                                   fontSize: 13.24,
@@ -131,8 +133,9 @@
                                     }
                                   },
                               ),
-                               TextSpan(
-                                text: AppLocalizations.of(context)!.withOneAccount,
+                              TextSpan(
+                                text: AppLocalizations.of(context)!
+                                    .withOneAccount,
                                 style: const TextStyle(
                                   color: Color(0xFF485972),
                                   fontSize: 13.24,
@@ -152,7 +155,7 @@
                             },
                           ));
                         },
-                        child:  EmailLinkActionButton(
+                        child: EmailLinkActionButton(
                           text: AppLocalizations.of(context)!.addMyEmail,
                         ),
                       ),
@@ -165,7 +168,7 @@
                             DateTime.now().millisecondsSinceEpoch,
                           );
                         },
-                        child:  EmailLinkSkipButton(
+                        child: EmailLinkSkipButton(
                           text: AppLocalizations.of(context)!.remindMeLater,
                         ),
                       ),

mobile/lib/screens/email_link/email_link_widgets.dart

@@ -9,6 +9,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class EmailLinkActionButton extends StatelessWidget {
   const EmailLinkActionButton({
@@ -115,7 +116,7 @@
                 ),
                 Expanded(
                   child: AutoSizeText(
-                    'Your Email is already registered ',
+                    AppLocalizations.of(context)!.yourEmailIsAlreadyRegistered,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                     textAlign: TextAlign.center,
@@ -189,12 +190,20 @@
             children: [
               const SizedBox(height: 8),
               GestureDetector(
-                onTap: () {
-                  Navigator.push(
+                onTap: () async {
+                  SharedPreferences prefs =
+                      await SharedPreferences.getInstance();
+                  prefs.setInt(
+                    'remindMeLaterTimestamp',
+                    DateTime.now().millisecondsSinceEpoch,
+                  );
+                  Navigator.pop(context);
+                  Navigator.pushAndRemoveUntil(
                     context,
-                    MaterialPageRoute(
-                      builder: (context) => const HomePage(),
-                    ),
+                    MaterialPageRoute(builder: (context) {
+                      return const HomePage();
+                    }),
+                    (r) => true,
                   );
                 },
                 child: Text(

mobile/lib/screens/home_page.dart

@@ -250,7 +250,6 @@ class _HomePageState extends State<HomePage> {
         } else if (user.isAnonymous) {
           return;
         }
-        await Future.delayed(const Duration(seconds: 2));
         if (mounted) {
           await bottomSheetEmailLink(context);
         }

mobile/lib/screens/profile/profile_view.dart

@@ -1,5 +1,6 @@
 import 'package:app/blocs/blocs.dart';
 import 'package:app/models/models.dart';
+import 'package:app/services/firebase_service.dart';
 import 'package:app/themes/theme.dart';
 import 'package:app/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -14,6 +15,16 @@
 
   @override
   Widget build(BuildContext context) {
+    final user = CustomAuth.getUser();
+    bool showLinkAccountReminder = false;
+
+    if (user != null && user.phoneNumber != null) {
+      if (user.email != null) {
+      } else if (user.isAnonymous) {
+      } else {
+        showLinkAccountReminder = true;
+      }
+    }
     return BlocBuilder<ProfileBloc, Profile>(
       builder: (context, profile) {
         if (profile.isAnonymous) {
@@ -24,9 +35,15 @@
           appBar: ProfileViewAppBar(profile),
           body: AppSafeArea(
             horizontalPadding: 16,
-            child: Column(
+            child: ListView(
               children: <Widget>[
                 const SizedBox(height: 10),
+                //TODO new feature loading
+                Visibility(
+                  visible: showLinkAccountReminder,
+                  child: const LinkAccountReminder(),
+                ),
+                const SizedBox(height: 6),
                 ProfileSection(profile),
                 const SizedBox(height: 16),
                 CardSection(
@@ -37,7 +54,7 @@
                   isBottomItem: true,
                   isTopItem: true,
                 ),
-                const Spacer(),
+                const SizedBox(height: 10),
                 const SignOutButton(),
                 const SizedBox(height: 10),
               ],

mobile/lib/screens/profile/profile_widgets.dart

@@ -3,19 +3,23 @@
 import 'package:app/blocs/blocs.dart';
 import 'package:app/constants/constants.dart';
 import 'package:app/models/models.dart';
+import 'package:app/screens/email_link/confirm_account_details.dart';
 import 'package:app/screens/notification/notification_page.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:cached_network_image/cached_network_image.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import '../favourite_places/favourite_places_page.dart';
 import '../feedback/feedback_page.dart';
@@ -1080,3 +1084,128 @@
     );
   }
 }
+
+class LinkAccountReminder extends StatelessWidget {
+  const LinkAccountReminder({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(8),
+      ),
+      color: const Color.fromARGB(255, 184, 217, 255),
+      elevation: 1,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        child: SizedBox(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                AppLocalizations.of(context)!.accessDeeperAirQualityInsights,
+                style: const TextStyle(
+                  color: Color.fromARGB(197, 0, 0, 0),
+                  fontSize: 18,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              const SizedBox(height: 4),
+              RichText(
+                textAlign: TextAlign.start,
+                text: TextSpan(
+                  children: [
+                    TextSpan(
+                      text: AppLocalizations.of(context)!
+                          .addYourEmailToYourProfileToEnableYouToAccessThe,
+                      style: const TextStyle(
+                        color: Color(0xFF485972),
+                        fontSize: 13.24,
+                        fontWeight: FontWeight.w400,
+                      ),
+                    ),
+                    TextSpan(
+                      text: "AirQo analytics ",
+                      style: TextStyle(
+                        color: CustomColors.appColorBlue,
+                        fontSize: 13.24,
+                        fontWeight: FontWeight.w400,
+                        decoration: TextDecoration.underline,
+                      ),
+                      recognizer: TapGestureRecognizer()
+                        ..onTap = () async {
+                          Uri url = Uri.parse('https://platform.airqo.net');
+                          if (await canLaunchUrl(url)) {
+                            await launchUrl(
+                              url,
+                              mode: LaunchMode.inAppBrowserView,
+                            );
+                          } else {
+                            throw 'Could not launch $url';
+                          }
+                        },
+                    ),
+                    TextSpan(
+                      text: AppLocalizations.of(context)!
+                          .usingYourAirQoMobileAppAccount,
+                      style: const TextStyle(
+                        color: Color(0xFF485972),
+                        fontSize: 13.24,
+                        fontWeight: FontWeight.w400,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 8),
+              MaterialButton(
+                height: 40,
+                color: CustomColors.appBodyColor,
+                onPressed: () async {
+                  Navigator.push(context, MaterialPageRoute(
+                    builder: (context) {
+                      return const EmailLinkScreen();
+                    },
+                  ));
+                },
+                padding: const EdgeInsets.only(top: 8, bottom: 8),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20),
+                ),
+                child: Row(
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.only(left: 16, right: 10),
+                      child: Text(
+                          AppLocalizations.of(context)!.addMyEmailToMyProfile,
+                          style: TextStyle(
+                            color: CustomColors.appColorBlue,
+                            fontSize: 14,
+                            fontWeight: FontWeight.w400,
+                          )),
+                    ),
+                    const SizedBox(width: 10),
+                    Container(
+                      height: 35,
+                      width: 35,
+                      decoration: const BoxDecoration(
+                        color: Color.fromARGB(255, 184, 217, 255),
+                        shape: BoxShape.circle,
+                      ),
+                      child: Icon(
+                        Icons.arrow_forward_ios_rounded,
+                        size: 18,
+                        color: CustomColors.appColorBlue,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}