alerte-secours/as-app
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: notification undefined souhaite que vous soyez son contact d'urgence

Browse source
This commit is contained in:
devthejo 2025-10-02 23:54:00 +02:00
parent 74c3326376
commit 76701774d1
No known key found for this signature in database
GPG key ID: 00CCA7A92B1D5351
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/notifications/channels/notifRelativeAllowAsk.js
View file

@ -59,16 +59,21 @@ export default async function notifRelativeAllowAsk(data) {
const [{ onePhoneNumber }] = relativeData.selectManyViewRelativePhoneNumber; const [{ onePhoneNumber }] = relativeData.selectManyViewRelativePhoneNumber;
const { number } = onePhoneNumber || {};
// Generate notification content // Generate notification content
const { title, body, bigText } = generateRelativeAllowAskContent({ const { title, body, bigText } = generateRelativeAllowAskContent({
onePhoneNumber, number,
}); });
await displayNotification({ await displayNotification({
channelId, channelId,
title, title,
body, body,
data, data: {
...data,
phoneNumber: number,
},
color: colors.primary, color: colors.primary,
bigText, bigText,
android: { android: {

9
src/notifications/channels/notifRelativeInvitation.js
View file

@ -62,19 +62,24 @@ export default async function notifRelativeInvitation(data) {
const oneUserPhoneNumberRelative = const oneUserPhoneNumberRelative =
relativeData.selectOneRelativeInvitation.oneUserPhoneNumberRelative; relativeData.selectOneRelativeInvitation.oneUserPhoneNumberRelative;
const { onePhoneNumber } = oneUserPhoneNumberRelative || {};
const { number } = onePhoneNumber || {};
// Generate notification content // Generate notification content
const { title, body, bigText } = generateRelativeInvitationContent({ const { title, body, bigText } = generateRelativeInvitationContent({
oneUserPhoneNumberRelative, number,
}); });
await displayNotification({ await displayNotification({
channelId, channelId,
title, title,
body, body,
data: {
...data,
phoneNumber: number,
},
color: colors.primary, color: colors.primary,
bigText, bigText,
data,
android: { android: {
pressAction: { pressAction: {
id: "open-relatives", id: "open-relatives",

20
src/notifications/content.js
View file

@ -2,6 +2,8 @@ import humanizeDistance from "~/lib/geo/humanizeDistance";
import levelLabel from "~/misc/levelLabel"; import levelLabel from "~/misc/levelLabel";
import kebabCase from "lodash.kebabcase"; import kebabCase from "lodash.kebabcase";
const RELATIVE_PHONE_FALLBACK = "Numéro non disponible";
export const generateAlertContent = (data) => { export const generateAlertContent = (data) => {
const { code, level, initialDistance, reason } = data; const { code, level, initialDistance, reason } = data;
@ -41,10 +43,11 @@ export const generateAlertEmergencyInfoContent = (data) => {
}; };
}; };
export const generateRelativeAllowAskContent = (data) => { export const generateRelativeAllowAskContent = (data = {}) => {
const { phoneNumber } = data; const { number, phoneNumber } = data;
const text = `${phoneNumber} souhaite que vous soyez son contact d'urgence`; const resolvedPhoneNumber = number ?? phoneNumber ?? RELATIVE_PHONE_FALLBACK;
const bigText = `Un utilisateur souhaite que vous soyez son contact d'urgence, voici son numéro de téléphone: ${phoneNumber}`; const text = `${resolvedPhoneNumber} souhaite que vous soyez son contact d'urgence`;
const bigText = `Un utilisateur souhaite que vous soyez son contact d'urgence, voici son numéro de téléphone: ${resolvedPhoneNumber}`;
return { return {
title: `Autoriser contact d'urgence`, title: `Autoriser contact d'urgence`,
@ -53,11 +56,12 @@ export const generateRelativeAllowAskContent = (data) => {
}; };
}; };
export const generateRelativeInvitationContent = (data) => { export const generateRelativeInvitationContent = (data = {}) => {
const { phoneNumber } = data; const { number, phoneNumber } = data;
const resolvedPhoneNumber = number ?? phoneNumber ?? RELATIVE_PHONE_FALLBACK;
const text = `${phoneNumber} vous propose d'être votre contact d'urgence`; const text = `${resolvedPhoneNumber} vous propose d'être votre contact d'urgence`;
const bigText = `Un utilisateur vous propose d'être votre contact d'urgence, voici son numéro de téléphone: ${phoneNumber}`; const bigText = `Un utilisateur vous propose d'être votre contact d'urgence, voici son numéro de téléphone: ${resolvedPhoneNumber}`;
return { return {
title: `Accepter contact d'urgence`, title: `Accepter contact d'urgence`,