src/lib/phone-call/index.js

@@ -1,75 +1,20 @@
-import { Platform, Linking, PermissionsAndroid } from "react-native";
+import { Platform, Linking } from "react-native";
 import RNImmediatePhoneCall from "react-native-immediate-phone-call";
 
-export async function phoneCallEmergency() {
+export function phoneCallEmergency() {
   const emergencyNumber = "112";
 
   if (Platform.OS === "ios") {
-    try {
+    // Use telprompt URL scheme on iOS
-      // Prefer telprompt on iOS for immediate prompt, fallback to tel
+    Linking.openURL(`telprompt:${emergencyNumber}`).catch((err) => {
-      await Linking.openURL(`telprompt:${emergencyNumber}`);
+      console.error("Error opening phone dialer:", err);
-    } catch (err) {
+      // Fallback to regular tel: if telprompt fails
-      console.error("Error opening phone dialer (iOS telprompt):", err);
+      Linking.openURL(`tel:${emergencyNumber}`).catch((err) => {
-      try {
+        console.error("Error opening phone dialer (fallback):", err);
-        await Linking.openURL(`tel:${emergencyNumber}`);
+      });
-      } catch (err2) {
+    });
-        console.error("Error opening phone dialer (iOS tel fallback):", err2);
-      }
-    }
-    return;
-  }
-
-  // Android: request CALL_PHONE upfront and provide deterministic fallback
-  try {
-    const granted = await PermissionsAndroid.request(
-      PermissionsAndroid.PERMISSIONS.CALL_PHONE,
-    );
-
-    if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-      // Try immediate call, but arm a short fallback timer in case the OS/OEM ignores ACTION_CALL
-      let fallbackTriggered = false;
-
-      const triggerFallback = async () => {
-        if (fallbackTriggered) return;
-        fallbackTriggered = true;
-        try {
-          await Linking.openURL(`tel:${emergencyNumber}`);
-        } catch (e) {
-          console.error("Fallback to dialer failed:", e);
-        }
-      };
-
-      // Fire fallback after ~1.2s if nothing happens
-      const timer = setTimeout(triggerFallback, 1200);
-
-      try {
-        RNImmediatePhoneCall.immediatePhoneCall(emergencyNumber);
-      } catch (callErr) {
-        // If native throws synchronously, cancel timer and fallback immediately
-        clearTimeout(timer);
-        await triggerFallback();
-        return;
-      }
-
-      // Give a little extra time; if no fallback was needed, clear the timer
-      setTimeout(() => {
-        if (!fallbackTriggered) clearTimeout(timer);
-      }, 3000);
   } else {
-      // Permission denied or never-ask-again: open dialer prompt
+    // Use RNImmediatePhoneCall on Android
-      try {
+    RNImmediatePhoneCall.immediatePhoneCall(emergencyNumber);
-        await Linking.openURL(`tel:${emergencyNumber}`);
-      } catch (err) {
-        console.error("Permission denied; dialer fallback failed:", err);
-      }
-    }
-  } catch (err) {
-    console.error("CALL_PHONE permission request failed:", err);
-    // Last resort: open dialer
-    try {
-      await Linking.openURL(`tel:${emergencyNumber}`);
-    } catch (err2) {
-      console.error("Dialer fallback failed after permission error:", err2);
-    }
   }
 }

src/scenes/Profile/AccountManagement.js

@@ -20,7 +20,6 @@ export default function AccountManagement({
   profileData,
   openAccountModal,
   waitingSmsType,
-  clearAuthWaitParams,
 }) {
   const { colors, custom } = useTheme();
   const isConnected = isConnectedProfile(profileData);
@@ -137,7 +136,6 @@ export default function AccountManagement({
         modalState={modalState}
         profileData={profileData}
         waitingSmsType={waitingSmsType}
-        clearAuthWaitParams={clearAuthWaitParams}
       />
     </View>
   );

src/scenes/Profile/AccountManagementModal.js

@@ -12,7 +12,6 @@ export default function AccountManagementModal({
   modalState,
   profileData,
   waitingSmsType,
-  clearAuthWaitParams,
 }) {
   const styles = useStyles();
   const [modal, setModal] = modalState;
@@ -39,7 +38,6 @@ export default function AccountManagementModal({
             authMethod={authMethod}
             setAuthMethod={setAuthMethod}
             waitingSmsType={waitingSmsType}
-            clearAuthWaitParams={clearAuthWaitParams}
           />
         )}
         {visible && component === "destroy" && (

src/scenes/Profile/AccountManagementModalConnect.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, useEffect } from "react";
 
-import { View } from "react-native";
+import { View, Alert } from "react-native";
 import LittleLoader from "~/components/LittleLoader";
 import { Button } from "react-native-paper";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
@@ -29,7 +29,6 @@ export default function AccountManagementModalConnect({
   authMethod,
   setAuthMethod,
   waitingSmsType,
-  clearAuthWaitParams,
 }) {
   const styles = useStyles();
   const { colors, custom } = useTheme();
@@ -71,12 +70,20 @@ export default function AccountManagementModalConnect({
     };
   }, [isLoading, loginRequest]);
 
-  const connectUsingPhoneNumber = () => {
+  const connectUsingPhoneNumber = async () => {
     setIsLoading(true);
-    sendAuthSMS({
+    try {
+      await sendAuthSMS({
         smsType: "C",
         body: "Se connecter sur Alerte-Secours:\nCode: [CODE]\n💙", // must don't exceed 160 chars including replaced [CODE]
       });
+    } catch (e) {
+      setIsLoading(false);
+      Alert.alert(
+        "Échec de l’ouverture des SMS",
+        "Impossible d’ouvrir l’application SMS. Réessayez.",
+      );
+    }
   };
 
   const smsDisclaimerModalStatePair = useState({ visible: false });
@@ -93,7 +100,6 @@ export default function AccountManagementModalConnect({
   const [loginConfirmRequest] = useMutation(LOGIN_CONFIRM_MUTATION);
 
   const confirmLoginRequest = useCallback(async () => {
-    try {
     const deviceUuid = await getDeviceUuid();
     const {
       data: {
@@ -103,29 +109,11 @@ export default function AccountManagementModalConnect({
       variables: { loginRequestId: loginRequest.id, deviceUuid },
     });
     await authActions.confirmLoginRequest({ authTokenJwt, isConnected });
-      setIsLoading(false);
+  }, [loginConfirmRequest, loginRequest?.id, isConnected]);
-      clearAuthWaitParams?.();
-      closeModal();
-    } catch (e) {
-      setIsLoading(false);
-    }
-  }, [
-    loginConfirmRequest,
-    loginRequest?.id,
-    isConnected,
-    clearAuthWaitParams,
-    closeModal,
-  ]);
 
   const rejectLoginRequest = useCallback(async () => {
-    try {
     await deleteLoginRequest({ variables: { id: loginRequest.id } });
-    } finally {
+  }, [deleteLoginRequest, loginRequest]);
-      setIsLoading(false);
-      clearAuthWaitParams?.();
-      closeModal();
-    }
-  }, [deleteLoginRequest, loginRequest?.id, clearAuthWaitParams, closeModal]);
 
   return (
     <View

src/scenes/Profile/Form.js

@@ -48,7 +48,6 @@ export default function Form({
   profileData,
   openAccountModal,
   waitingSmsType,
-  clearAuthWaitParams,
 }) {
   const { userId } = useSessionState(["userId"]);
 
@@ -154,11 +153,7 @@ export default function Form({
               borderBottomWidth: 1,
             }}
           >
-            <PhoneNumbers
+            <PhoneNumbers data={profileData} waitingSmsType={waitingSmsType} />
-              data={profileData}
-              waitingSmsType={waitingSmsType}
-              clearAuthWaitParams={clearAuthWaitParams}
-            />
           </View>
 
           <View
@@ -195,7 +190,6 @@ export default function Form({
             profileData={profileData}
             openAccountModal={openAccountModal}
             waitingSmsType={waitingSmsType}
-            clearAuthWaitParams={clearAuthWaitParams}
           />
         </View>
       </View>

src/scenes/Profile/PhoneNumbers.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from "react";
 
-import { View } from "react-native";
+import { View, Alert } from "react-native";
 
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 
@@ -26,11 +26,7 @@ import {
 
 import useSendAuthSMS from "~/hooks/useSendAuthSMS";
 
-export default function PhoneNumbersView({
+export default function PhoneNumbersView({ data, waitingSmsType }) {
-  data,
-  waitingSmsType,
-  clearAuthWaitParams,
-}) {
   const [isLoading, setIsLoading] = useState(waitingSmsType === "R" || false);
   const phoneNumberList = data.selectOneUser.manyPhoneNumber;
 
@@ -45,10 +41,18 @@ export default function PhoneNumbersView({
 
   const registerPhoneNumber = useCallback(async () => {
     setIsLoading(true);
-    sendAuthSMS({
+    try {
+      await sendAuthSMS({
         smsType: "R",
         body: "S'enregistrer sur Alerte-Secours:\nCode: [CODE]\n💙", // must don't exceed 160 chars including replaced [CODE]
       });
+    } catch (e) {
+      setIsLoading(false);
+      Alert.alert(
+        "Échec de l’ouverture des SMS",
+        "Impossible d’ouvrir l’application SMS. Réessayez.",
+      );
+    }
   }, [sendAuthSMS, setIsLoading]);
 
   // Clear loading state after 3 minutes
@@ -73,16 +77,8 @@ export default function PhoneNumbersView({
   useEffect(() => {
     if (data.selectOneUser.oneUserLoginRequest) {
       setIsLoading(false);
-      clearAuthWaitParams?.();
     }
-  }, [data.selectOneUser.oneUserLoginRequest, clearAuthWaitParams]);
+  }, [data.selectOneUser.oneUserLoginRequest]);
-
-  // Defensive cleanup on unmount to ensure no lingering loader
-  useEffect(() => {
-    return () => {
-      setIsLoading(false);
-    };
-  }, []);
 
   const deletePhoneNumberModalStatePair = useState({ visible: false });
   const [deletePhoneNumberModalState, setDeletePhoneNumberModalState] =

src/scenes/Profile/index.js

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 
-import { ScrollView, View } from "react-native";
+import { ScrollView, View, AppState } from "react-native";
 
 import Loader from "~/components/Loader";
 import { useSubscription } from "@apollo/client";
@@ -12,6 +12,7 @@ import { createLogger } from "~/lib/logger";
 import { FEATURE_SCOPES } from "~/lib/logger/scopes";
 
 import withConnectivity from "~/hoc/withConnectivity";
+import { useFocusEffect } from "@react-navigation/native";
 
 import Form from "./Form";
 
@@ -37,12 +38,38 @@ export default withConnectivity(function Profile({ navigation, route }) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userId]);
 
-  const clearAuthWaitParams = React.useCallback(() => {
+  useFocusEffect(
+    React.useCallback(() => {
+      restart();
+    }, [restart]),
+  );
+
+  useEffect(() => {
+    const sub = AppState.addEventListener("change", (state) => {
+      if (state === "active") {
+        restart();
+      }
+    });
+    return () => {
+      sub?.remove?.();
+    };
+  }, [restart]);
+
+  useEffect(() => {
+    if (
+      route.params?.waitingSmsType &&
+      data?.selectOneUser?.oneUserLoginRequest
+    ) {
       navigation.setParams({
         waitingSmsType: undefined,
-      openAccountModal: undefined,
+        openAccountModal: true,
       });
-  }, [navigation]);
+    }
+  }, [
+    route.params?.waitingSmsType,
+    data?.selectOneUser?.oneUserLoginRequest,
+    navigation,
+  ]);
 
   if (loading || !data?.selectOneUser) {
     return <Loader />;
@@ -60,7 +87,6 @@ export default withConnectivity(function Profile({ navigation, route }) {
         profileData={data}
         openAccountModal={route.params?.openAccountModal}
         waitingSmsType={route.params?.waitingSmsType}
-        clearAuthWaitParams={clearAuthWaitParams}
       />
     </ScrollView>
   );