src/scenes/SendAlertConfirm/FieldNotifySelector.js

@@ -22,7 +22,6 @@ export default function FieldNotifySelector() {
   const callEmergency = watch("callEmergency");
   const notifyAround = watch("notifyAround");
   const notifyRelatives = watch("notifyRelatives");
-  const followLocation = watch("followLocation");
   const level = watch("level");
 
   const checkedColor = colors.primary;
@@ -107,29 +106,6 @@ export default function FieldNotifySelector() {
           }}
         />
       </View>
-      <View style={styles.followLocationContainer}>
-        <CheckboxItem
-          status={followLocation ? "checked" : "unchecked"}
-          style={styles.checkboxItem}
-          labelStyle={styles.checkboxLabel}
-          size={styleOptions.checkboxItem.size}
-          icon={() => (
-            <MaterialCommunityIcons
-              name="crosshairs-gps"
-              style={styles.checkboxIcon}
-              onPress={() => {
-                setValue("followLocation", !followLocation);
-              }}
-            />
-          )}
-          color={checkedColor}
-          uncheckedColor={uncheckedColor}
-          label="Suivre ma localisation"
-          onPress={() => {
-            setValue("followLocation", !followLocation);
-          }}
-        />
-      </View>
     </View>
   );
 }
@@ -146,7 +122,6 @@ const useStyles = createStyles(
   ({ wp, hp, scaleText, fontSize, theme: { colors, textShadowForWhite } }) => ({
     container: {
       marginTop: hp(2),
-      marginBottom: hp(3),
     },
     checkboxItemContainer: {
       borderRadius: 4,
@@ -155,13 +130,6 @@ const useStyles = createStyles(
       marginVertical: hp(0.2),
       backgroundColor: colors.surface,
     },
-    followLocationContainer: {
-      borderRadius: 4,
-      borderWidth: 1,
-      borderColor: colors.outline,
-      marginVertical: hp(4),
-      backgroundColor: colors.surface,
-    },
     checkboxItem: {
       paddingHorizontal: 6,
     },

src/scenes/SendAlertConfirm/index.js

@@ -9,8 +9,7 @@ export default function SendAlertConfirm({ route }) {
 
   const { alert } = params;
   const level = alert?.level || params.level;
-  const callEmergency =
+  const callEmergency = params.forceCallEmergency || level === "red";
-    params.forceCallEmergency || level === "red" || level === "yellow";
 
   const methods = useForm({
     defaultValues: {
@@ -19,7 +18,6 @@ export default function SendAlertConfirm({ route }) {
       callEmergency,
       notifyAround: true,
       notifyRelatives: true,
-      followLocation: true,
     },
   });
 

src/scenes/SendAlertConfirm/useOnSubmit.js

@@ -33,14 +33,8 @@ async function onSubmit(args, context) {
   const [alertInput] = args;
   const { navigation } = context;
 
-  const {
+  const { subject, level, callEmergency, notifyAround, notifyRelatives } =
-    subject,
+    alertInput;
-    level,
-    callEmergency,
-    notifyAround,
-    notifyRelatives,
-    followLocation,
-  } = alertInput;
 
   const coords = await getCurrentLocation();
 
@@ -68,7 +62,6 @@ async function onSubmit(args, context) {
     callEmergency,
     notifyAround,
     notifyRelatives,
-    followLocation: !!followLocation,
     location,
     accuracy,
     altitude,