Email phone sync

mobile/lib/l10n/app_en.arb

@@ -351,5 +351,18 @@
     "languages": "Languages",
     "dataProvider":"Data Provider: {placeholder}",
     "reDOLesson": "Re-do lesson",
-    "reDoQuiz": "Re-do quiz"
+    "reDoQuiz": "Re-do quiz",
+    "addYourEmail":"Add your Email",
+    "yourEmailHasBeenAdded":"Your Email has been added",
+    "add":"Add",
+    "skip":"skip",
+    "oopsSomethingWentWrongPleaseTryAgainLater":"Oops something went wrong! Please try again later",
+    "tryAgainLater":"Try again later",
+    "yourEmailIsAlreadyRegistered":"Your Email is already registered",
+    "weAreShufflingThingsAroundForYou":"We are shuffling things around for you.....",
+    "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"
+
 }

mobile/lib/l10n/app_fr.arb

@@ -341,5 +341,17 @@
   "languages": "Langues",
   "dataProvider":"Fournisseur de données: {placeholder}",
   "reDOLesson": "Refaire la leçon",
-  "reDoQuiz": "Refaire le quiz"
-  }
+  "reDoQuiz": "Refaire le quiz",
+  "addYourEmail":"Ajoutez votre e-mail",
+  "yourEmailHasBeenAdded":"Votre e-mail a été ajouté",
+  "add":"ajouter",
+  "skip":"sauter",
+  "oopsSomethingWentWrongPleaseTryAgainLater":"Oups quelque chose a mal tourné! Veuillez réessayer plus tard",
+  "tryAgainLater":"réessayez plus tard",
+  "yourEmailIsAlreadyRegistered":"Votre e-mail est déjà enregistré",
+  "weAreShufflingThingsAroundForYou":"Nous mélangeons des choses pour vous .....",
+  "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"
+}

mobile/lib/l10n/app_lg.arb

@@ -343,5 +343,18 @@
     "languages": "Ennimi",
     "dataProvider":"Ensibuko yo'bubaka: {placeholder}",
     "reDOLesson": "Ddiŋŋana essomo",
-    "reDoQuiz": "Ddiŋŋana Ekibuuzo"
-}
+    "reDoQuiz": "Ddiŋŋana Ekibuuzo",
+    "addYourEmail":"Yongerako Email yo",
+    "yourEmailHasBeenAdded":"Email yo eyongezeddwayo",
+    "add":"Okwongerako",
+    "skip":"simbula",
+    "oopsSomethingWentWrongPleaseTryAgainLater":"Oops waliwo ekikyamu! Nsaba oddemu ogezeeko oluvannyuma",
+    "tryAgainLater":"Ddamu gezaako oluvannyuma",
+    "yourEmailIsAlreadyRegistered":"Email yo yawandiisibwa dda",
+    "weAreShufflingThingsAroundForYou":"Tutabula ebintu ku lulwo.....",
+    "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"
+
+}

mobile/lib/l10n/app_pt.arb

@@ -341,5 +341,17 @@
 	"languageChangedSuccessfully": "Idioma alterado com sucesso {placeholder}",
 	"ok": "OK",
 	"languages": "Idiomas",
-	"dataProvider":"Fornecedor de dados: {placeholder}"
+	"dataProvider":"Fornecedor de dados: {placeholder}",
+	"addYourEmail":"Adicione seu e-mail",
+    "yourEmailHasBeenAdded":"Seu e-mail foi adicionado",
+    "add":"Adicionar",
+    "skip":"pular",
+    "oopsSomethingWentWrongPleaseTryAgainLater":"Opa, algo deu errado! Tente novamente mais tarde",
+    "tryAgainLater":"Tente novamente mais tarde",
+    "yourEmailIsAlreadyRegistered":"Seu e-mail já está cadastrado",
+    "weAreShufflingThingsAroundForYou":"Estamos embaralhando as coisas para você.....",
+    "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"
 	}

mobile/lib/l10n/app_sw.arb

@@ -342,5 +342,17 @@
     "dataProvider":"Mtoa Huduma: {placeholder}",
     "reDOLesson": "Fanya tena somo",
     "reDoQuiz": "Fanya tena mtihani",
-    "continueLearning" : "Endelea kujifunza"
+    "continueLearning" : "Endelea kujifunza",
+    "addYourEmail":"Ongeza Barua pepe yako",
+    "yourEmailHasBeenAdded":"Barua pepe yako imeongezwa",
+    "add":"Ongeza",
+    "skip":"ruka",
+    "oopsSomethingWentWrongPleaseTryAgainLater":"Lo kuna hitilafu! Tafadhali jaribu tena baadaye",
+    "tryAgainLater":"Jaribu tena baadaye",
+    "yourEmailIsAlreadyRegistered":"Barua pepe yako tayari imesajiliwa",
+    "weAreShufflingThingsAroundForYou":"Tunachanganya mambo kwa ajili yako....",
+    "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"
 }

mobile/lib/main.dart

@@ -59,8 +59,7 @@ void main() async {
     );
     FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
 
-    FirebaseMessaging.onMessage.listen((RemoteMessage message) {
-    });
+    FirebaseMessaging.onMessage.listen((RemoteMessage message) {});
 
     runApp(configuredApp);
   } catch (exception, stackTrace) {
@@ -69,14 +68,13 @@ void main() async {
         title: 'AirQo',
         theme: customTheme(),
         localizationsDelegates: const [
+          LgMaterialLocalizations.delegate,
+          LgCupertinoLocalizations.delegate,
+          LgWidgetsLocalizations.delegate,
           AppLocalizations.delegate,
           GlobalMaterialLocalizations.delegate,
           GlobalWidgetsLocalizations.delegate,
           GlobalCupertinoLocalizations.delegate,
-          LgMaterialLocalizations.delegate,
-          LgCupertinoLocalizations.delegate,
-          LgWidgetsLocalizations.delegate,
-
         ],
         supportedLocales: const [
           Locale('en'), // English

mobile/lib/screens/email_authentication/email_verification_screen.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'package:app/blocs/blocs.dart';
 import 'package:app/models/enum_constants.dart';
 import 'package:app/screens/email_authentication/email_auth_widgets.dart';
@@ -6,6 +8,7 @@
 import 'package:app/utils/utils.dart';
 import 'package:app/widgets/widgets.dart';
 import 'package:firebase_auth/firebase_auth.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -208,39 +211,80 @@
     );
   }
 
+  Future<void> linkAccounts() async {
+    final emailAuthModel =
+        context.read<EmailVerificationBloc>().state.emailAuthModel;
+
+    final emailCredential = EmailAuthProvider.credentialWithLink(
+      emailLink: emailAuthModel.signInLink,
+      email: emailAuthModel.emailAddress,
+    );
+
+    final user = FirebaseAuth.instance.currentUser;
+
+    try {
+      if (user != null) {
+        await user.linkWithCredential(emailCredential);
+        context.read<EmailVerificationBloc>().add(
+              const SetEmailVerificationStatus(
+                AuthenticationStatus.success,
+              ),
+            );
+        await AirqoApiClient().syncPlatformAccount();
+      }
+    } catch (error) {
+      context.read<EmailVerificationBloc>().add(
+            const SetEmailVerificationStatus(
+              AuthenticationStatus.error,
+            ),
+          );
+      if (kDebugMode) {
+        print('Error linking accounts: $error');
+      }
+    }
+  }
+
   Future<void> _authenticate() async {
     loadingScreen(context);
 
     final emailAuthModel =
         context.read<EmailVerificationBloc>().state.emailAuthModel;
-
     final emailCredential = EmailAuthProvider.credentialWithLink(
       emailLink: emailAuthModel.signInLink,
       email: emailAuthModel.emailAddress,
     );
 
     try {
-      final bool authenticationSuccessful =
-          await CustomAuth.firebaseSignIn(emailCredential);
-      if (!mounted) return;
+      final currentUser = FirebaseAuth.instance.currentUser;
+      if (currentUser != null) {
+        // Link the email credential with the existing user
+        await currentUser.linkWithCredential(emailCredential);
+      } else {
+        // Perform email authentication if not signed in with phone number
+        final bool authenticationSuccessful =
+            await CustomAuth.firebaseSignIn(emailCredential);
+        if (!mounted) return;
 
-      Navigator.pop(context);
+        if (!authenticationSuccessful) {
+          await showDialog<void>(
+            context: context,
+            barrierDismissible: false,
+            builder: (BuildContext _) {
+              return const AuthFailureDialog();
+            },
+          );
+        }
+      }
 
-      if (authenticationSuccessful) {
-        context
-            .read<EmailVerificationBloc>()
-            .add(const SetEmailVerificationStatus(
-              AuthenticationStatus.success,
-            ));
+      context
+          .read<EmailVerificationBloc>()
+          .add(const SetEmailVerificationStatus(
+            AuthenticationStatus.success,
+          ));
+
+      // Check if account linking was done, skip postSignInActions
+      if (currentUser == null) {
         await AppService.postSignInActions(context);
-      } else {
-        await showDialog<void>(
-          context: context,
-          barrierDismissible: false,
-          builder: (BuildContext _) {
-            return const AuthFailureDialog();
-          },
-        );
       }
     } catch (exception, stackTrace) {
       Navigator.pop(context);