Notifications

src/datasources/push-notifications-api/entities/firebase-notification.entity.ts

@@ -1,7 +1,23 @@
 export type FirebaseNotification = {
-  notification?: {
-    title?: string;
-    body?: string;
-  };
+  notification?: NotificationContent;
   data?: Record<string, string>;
 };
+
+export type NotificationContent = {
+  title?: string;
+  body?: string;
+};
+
+export type FireabaseNotificationApn = {
+  apns: {
+    payload: {
+      aps: {
+        alert: {
+          title: string;
+          body: string;
+        };
+        'mutable-content': 1 | 0;
+      };
+    };
+  };
+};

src/datasources/push-notifications-api/firebase-cloud-messaging-api.service.spec.ts

@@ -103,6 +103,19 @@ describe('FirebaseCloudMessagingApiService', () => {
         message: {
           token: fcmToken,
           ...notification,
+          ...{
+            apns: {
+              payload: {
+                aps: {
+                  alert: {
+                    title: notification.notification?.title,
+                    body: notification.notification?.body,
+                  },
+                  'mutable-content': 1,
+                },
+              },
+            },
+          },
         },
       },
       networkRequest: {
@@ -141,6 +154,19 @@ describe('FirebaseCloudMessagingApiService', () => {
         message: {
           token: fcmToken,
           ...notification,
+          ...{
+            apns: {
+              payload: {
+                aps: {
+                  alert: {
+                    title: notification.notification?.title,
+                    body: notification.notification?.body,
+                  },
+                  'mutable-content': 1,
+                },
+              },
+            },
+          },
         },
       },
       networkRequest: {

src/datasources/push-notifications-api/firebase-cloud-messaging-api.service.ts

@@ -11,7 +11,11 @@ import {
 } from '@/datasources/network/network.service.interface';
 import { IPushNotificationsApi } from '@/domain/interfaces/push-notifications-api.interface';
 import { Inject, Injectable } from '@nestjs/common';
-import { FirebaseNotification } from '@/datasources/push-notifications-api/entities/firebase-notification.entity';
+import {
+  FireabaseNotificationApn,
+  FirebaseNotification,
+  NotificationContent,
+} from '@/datasources/push-notifications-api/entities/firebase-notification.entity';
 import { IJwtService } from '@/datasources/jwt/jwt.service.interface';
 import {
   FirebaseOauth2Token,
@@ -26,6 +30,10 @@ export class FirebaseCloudMessagingApiService implements IPushNotificationsApi {
   private static readonly Scope =
     'https://www.googleapis.com/auth/firebase.messaging';
 
+  private static readonly defaultIosNotificationTitle = 'New Activity';
+  private static readonly defaultIosNotificationBody =
+    'New Activity with your Safe';
+
   private readonly baseUrl: string;
   private readonly project: string;
   private readonly clientEmail: string;
@@ -57,6 +65,39 @@ export class FirebaseCloudMessagingApiService implements IPushNotificationsApi {
     );
   }
 
+  /**
+   * Returns the notification data for iOS devices.
+   *
+   * On iOS, a title and body are required for a notification to be displayed.
+   * The `mutable-content` field is set to `1` to allow the notification to be modified by the app.
+   *      This ensures an appropriate title and body are displayed to the user.
+   *
+   * @param {NotificationContent} notification - notification payload
+   *
+   * @returns {FireabaseNotificationApn} - iOS notification data
+   **/
+  private getIosNotificationData(
+    notification?: NotificationContent,
+  ): FireabaseNotificationApn {
+    return {
+      apns: {
+        payload: {
+          aps: {
+            alert: {
+              title:
+                notification?.title ??
+                FirebaseCloudMessagingApiService.defaultIosNotificationTitle,
+              body:
+                notification?.body ??
+                FirebaseCloudMessagingApiService.defaultIosNotificationBody,
+            },
+            'mutable-content': 1,
+          },
+        },
+      },
+    };
+  }
+
   /**
    * Enqueues a notification to be sent to a device with given FCM token.
    *
@@ -76,6 +117,7 @@ export class FirebaseCloudMessagingApiService implements IPushNotificationsApi {
           message: {
             token: fcmToken,
             ...notification,
+            ...this.getIosNotificationData(notification.notification),
           },
         },
         networkRequest: {

src/domain/hooks/helpers/event-notifications.helper.ts

@@ -35,6 +35,7 @@ import {
 } from '@/domain/delegate/v2/delegates.v2.repository.interface';
 import { UUID } from 'crypto';
 import { NotificationsRepositoryV2Module } from '@/domain/notifications/v2/notifications.repository.module';
+import uniqBy from 'lodash/uniqBy';
 
 type EventToNotify =
   | DeletedMultisigTransactionEvent
@@ -163,11 +164,13 @@ export class EventNotificationsHelper {
       cloudMessagingToken: string;
     }>
   > {
-    const subscriptions =
+    const subscriptions = uniqBy(
       await this.notificationsRepository.getSubscribersBySafe({
         chainId: event.chainId,
         safeAddress: event.address,
-      });
+      }),
+      'cloudMessagingToken',
+    );
 
     if (!this.isOwnerOrDelegateOnlyEventToNotify(event)) {
       return subscriptions;
@@ -227,12 +230,13 @@ export class EventNotificationsHelper {
       return true;
     }
 
-    const delegates = await this.delegatesRepository.getDelegates(args);
-    return !!delegates?.results.some((delegate) => {
-      return (
-        delegate.safe === args.safeAddress &&
-        delegate.delegate === args.subscriber
-      );
+    const delegates = await this.delegatesRepository.getDelegates({
+      chainId: args.chainId,
+      delegate: args.subscriber,
+    });
+
+    return delegates?.results.some((delegate) => {
+      return safe.owners.includes(delegate.delegator);
     });
   }
 
@@ -336,9 +340,19 @@ export class EventNotificationsHelper {
     });
 
     // Subscriber has already signed - do not notify
+    const delegates = await this.delegatesRepository.getDelegates({
+      chainId: event.chainId,
+      delegate: subscriber,
+    });
+    const delegators = delegates?.results.map(
+      (delegate) => delegate?.delegator,
+    );
     const hasSubscriberSigned = transaction.confirmations?.some(
       (confirmation) => {
-        return confirmation.owner === subscriber;
+        return (
+          confirmation.owner === subscriber ||
+          delegators.includes(confirmation.owner)
+        );
       },
     );
     if (hasSubscriberSigned) {
@@ -385,8 +399,19 @@ export class EventNotificationsHelper {
     });
 
     // Subscriber has already signed - do not notify
-    const hasSubscriberSigned = message.confirmations.some((confirmation) => {
-      return confirmation.owner === subscriber;
+    const delegates = await this.delegatesRepository.getDelegates({
+      chainId: event.chainId,
+      delegate: subscriber,
+    });
+    const delegators = delegates?.results.map(
+      (delegate) => delegate?.delegator,
+    );
+
+    const hasSubscriberSigned = message.confirmations?.some((confirmation) => {
+      return (
+        confirmation.owner === subscriber ||
+        delegators.includes(confirmation.owner)
+      );
     });
     if (hasSubscriberSigned) {
       return null;

src/domain/notifications/v2/entities/__tests__/notification.repository.mock.ts

@@ -6,6 +6,7 @@ export const MockNotificationRepositoryV2: jest.MockedObjectDeep<INotificationsR
     upsertSubscriptions: jest.fn(),
     getSafeSubscription: jest.fn(),
     getSubscribersBySafe: jest.fn(),
+    deleteDeviceOwners: jest.fn(),
     deleteSubscription: jest.fn(),
     deleteDevice: jest.fn(),
   };

src/domain/notifications/v2/notifications.repository.interface.ts

@@ -27,6 +27,8 @@ export interface INotificationsRepositoryV2 {
     safeAddress: `0x${string}`;
   }): Promise<Array<NotificationType>>;
 
+  deleteDeviceOwners(deviceUUid: UUID): Promise<void>;
+
   getSubscribersBySafe(args: {
     chainId: string;
     safeAddress: `0x${string}`;

src/domain/notifications/v2/notifications.repository.ts

@@ -147,6 +147,23 @@ export class NotificationsRepositoryV2 implements INotificationsRepositoryV2 {
     return { id: queryResult.identifiers[0].id, device_uuid: deviceUuid };
   }
 
+  public async deleteDeviceOwners(deviceUuid: UUID): Promise<void> {
+    const deviceSubscriptionsRepository =
+      await this.postgresDatabaseService.getRepository<NotificationSubscription>(
+        NotificationSubscription,
+      );
+    const deviceSubscriptions = await deviceSubscriptionsRepository.find({
+      where: {
+        push_notification_device: {
+          device_uuid: deviceUuid,
+        },
+      },
+    });
+    if (deviceSubscriptions.length) {
+      await deviceSubscriptionsRepository.remove(deviceSubscriptions);
+    }
+  }
+
   private async deletePreviousSubscriptions(
     entityManager: EntityManager,
     args: {

src/routes/hooks/__tests__/event-hooks-queue.e2e-spec.ts

@@ -130,6 +130,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'NEW_CONFIRMATION',
@@ -178,6 +179,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'NEW_CONFIRMATION',
@@ -221,6 +223,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'MODULE_TRANSACTION',
@@ -260,6 +263,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'INCOMING_TOKEN',
@@ -304,6 +308,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'INCOMING_TOKEN',
@@ -424,6 +429,7 @@ describe('Events queue processing e2e tests', () => {
       to: faker.finance.ethereumAddress(),
       safeTxHash: faker.string.hexadecimal({ length: 32 }),
       txHash: faker.string.hexadecimal({ length: 32 }),
+      failed: faker.helpers.arrayElement(['true', 'false']),
     },
     {
       type: 'INCOMING_TOKEN',

src/routes/hooks/entities/__tests__/executed-transaction.builder.ts

@@ -11,6 +11,7 @@ export function executedTransactionEventBuilder(): IBuilder<ExecutedTransaction>
     .with('to', getAddress(faker.finance.ethereumAddress()))
     .with('address', getAddress(faker.finance.ethereumAddress()))
     .with('chainId', faker.string.numeric())
-    .with('safeTxHash', faker.string.hexadecimal())
-    .with('txHash', faker.string.hexadecimal());
+    .with('safeTxHash', faker.string.hexadecimal() as `0x${string}`)
+    .with('txHash', faker.string.hexadecimal() as `0x${string}`)
+    .with('failed', faker.helpers.arrayElement(['true', 'false']));
 }

src/routes/hooks/entities/__tests__/pending-transaction.builder.ts

@@ -11,5 +11,5 @@ export function pendingTransactionEventBuilder(): IBuilder<PendingTransaction> {
     .with('to', getAddress(faker.finance.ethereumAddress()))
     .with('address', getAddress(faker.finance.ethereumAddress()))
     .with('chainId', faker.string.numeric())
-    .with('safeTxHash', faker.string.hexadecimal());
+    .with('safeTxHash', faker.string.hexadecimal() as `0x${string}`);
 }

src/routes/hooks/entities/schemas/executed-transaction.schema.ts

@@ -1,14 +1,16 @@
 import { TransactionEventType } from '@/routes/hooks/entities/event-type.entity';
 import { AddressSchema } from '@/validation/entities/schemas/address.schema';
+import { HexSchema } from '@/validation/entities/schemas/hex.schema';
 import { z } from 'zod';
 
 export const ExecutedTransactionEventSchema = z.object({
   type: z.literal(TransactionEventType.EXECUTED_MULTISIG_TRANSACTION),
   to: AddressSchema,
   address: AddressSchema,
   chainId: z.string(),
-  safeTxHash: z.string(),
-  txHash: z.string(),
+  safeTxHash: HexSchema,
+  txHash: HexSchema,
+  failed: z.union([z.literal('true'), z.literal('false')]),
 });
 
 export type ExecutedTransactionEvent = z.infer<

src/routes/hooks/entities/schemas/pending-transaction.schema.ts

@@ -1,13 +1,14 @@
 import { TransactionEventType } from '@/routes/hooks/entities/event-type.entity';
 import { z } from 'zod';
 import { AddressSchema } from '@/validation/entities/schemas/address.schema';
+import { HexSchema } from '@/validation/entities/schemas/hex.schema';
 
 export const PendingTransactionEventSchema = z.object({
   type: z.literal(TransactionEventType.PENDING_MULTISIG_TRANSACTION),
   to: AddressSchema,
   address: AddressSchema,
   chainId: z.string(),
-  safeTxHash: z.string(),
+  safeTxHash: HexSchema,
 });
 
 export type PendingTransactionEvent = z.infer<