react-native-notify-kit 10.6.0 → 10.7.1

package/README.md

@@ -242,6 +242,54 @@ export default {
 
 On Android, FCM Mode stays data-only. Configure Firebase and RNFirebase in the app, create the Android channel used by your payloads, then call `notifee.handleFcmMessage(remoteMessage)` from RNFirebase `onMessage` and `setBackgroundMessageHandler`. The Expo smoke app validates foreground and background delivery with the `android-expo-smoke` scenario on a real device.
 
+#### Android notification small icons
+
+For Expo CNG/prebuild projects, the config plugin can generate small notification icon resources without manually editing generated `android/` directories. This resource-generation option is independent of FCM Mode:
+
+```ts
+export default {
+  expo: {
+    plugins: [
+      [
+        'react-native-notify-kit',
+        {
+          android: {
+            icons: [
+              {
+                name: 'notification_message',
+                path: './assets/notification-message.png',
+                type: 'small',
+              },
+              {
+                name: 'notification_warning',
+                path: './assets/notification-warning.png',
+                type: 'small',
+              },
+            ],
+          },
+        },
+      ],
+    ],
+  },
+};
+```
+
+During prebuild, each entry generates density-specific PNG drawable resources (`mdpi` 24×24, `hdpi` 36×36, `xhdpi` 48×48, `xxhdpi` 72×72, and `xxxhdpi` 96×96) with a transparent background and `cover` resizing. The source `path` must be a project-relative PNG inside the project root. The `name` must start with a lowercase letter and contain only `a-z`, `0-9`, and `_`; invalid names are rejected rather than normalized. The array supports multiple icons and preserves their order. Each entry must include `type: 'small'`; omitting it or using another type fails during configuration/prebuild. The plugin also writes an Android resource-shrinker keep rule for the generated icons.
+
+`android.icons` generates resources; it does not select an icon for a notification. Pass the configured resource `name`—not its file path—to `android.smallIcon`:
+
+```ts
+await notifee.displayNotification({
+  title: 'New message',
+  android: {
+    channelId: 'messages',
+    smallIcon: 'notification_message',
+  },
+});
+```
+
+This option does not configure Firebase or set `com.google.firebase.messaging.default_notification_icon`.
+
 Android foreground service manifest configuration is also available through the NotifyKit config plugin, but it is explicit opt-in:
 
 ```ts
@@ -926,6 +974,8 @@ Three causes account for the vast majority of reports:
 
 **Naming mismatch.** Android resource names are case-sensitive and only accept `[a-z0-9_]`. A string like `smallIcon: 'icNotification'` will not resolve `ic_notification.png`. Rename the `smallIcon` value to match the file on disk exactly.
 
+For Expo CNG/prebuild apps, use the NotifyKit config plugin's `android.icons` option instead of editing generated `android/` directories. It generates the density-specific drawables and writes a resource-shrinker keep rule during prebuild; continue to pass the configured resource `name` to `android.smallIcon`.
+
 For the full procedure on creating a small-icon asset via Android Studio, see [docs/react-native/android/appearance.mdx](docs/react-native/android/appearance.mdx).
 
 #### Custom sounds for push notifications in background or killed state

package/dist/fcm/reconstructNotification.js

@@ -4,6 +4,7 @@
  */
 import { AndroidStyle } from '../types/NotificationAndroid';
 import { isAndroid, isIOS } from '../utils';
+import { isValidTimestamp } from '../validators/validate';
 const PREFIX = '[react-native-notify-kit]';
 const RESERVED_DATA_KEYS = new Set(['notifee_options', 'notifee_data']);
 const VALID_INTERRUPTION_LEVELS = new Set(['active', 'critical', 'passive', 'timeSensitive']);
@@ -92,6 +93,12 @@ function buildAndroidConfig(raw, config) {
         android.largeIcon = raw.largeIcon;
     if (typeof raw?.color === 'string')
         android.color = raw.color;
+    // Timestamp fields — preserve only values accepted by the canonical Android validator
+    if (typeof raw?.showTimestamp === 'boolean')
+        android.showTimestamp = raw.showTimestamp;
+    if (typeof raw?.timestamp === 'number' && isValidTimestamp(raw.timestamp)) {
+        android.timestamp = raw.timestamp;
+    }
     // Actions array — pass through (trust server validation)
     if (Array.isArray(raw?.actions)) {
         android.actions = raw.actions;

package/dist/fcm/reconstructNotification.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconstructNotification.js","sourceRoot":"","sources":["../../src/fcm/reconstructNotification.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconstructNotification.js","sourceRoot":"","sources":["../../src/fcm/reconstructNotification.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.6.0";
+export declare const version = "10.7.1";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.6.0';
+export const version = '10.7.1';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.6.0",
+  "version": "10.7.1",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible React Native notifications library for Android, iOS, FCM Mode, rich notifications, foreground services, and Expo CNG development builds.",
   "main": "dist/index.js",
@@ -40,6 +40,9 @@
     "format:ios": "npm_config_yes=true npx clang-format -i --glob=\"ios/**/*.{h,cpp,m,mm}\" --style=Google",
     "format:ios:check": "npm_config_yes=true npx clang-format --glob=\"ios/**/*.{h,cpp,m,mm}\" --style=Google -n -Werror"
   },
+  "dependencies": {
+    "@expo/image-utils": "^0.8.14"
+  },
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",

package/plugin/build/android/withNotifyKitAndroidNotificationIcons.js

@@ -0,0 +1,498 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { generateImageAsync } = require('@expo/image-utils');
+
+const { normalizeAndroidNotificationIcons } = require('../options');
+
+const ANDROID_NOTIFICATION_ICON_DENSITIES = [
+  { density: 'mdpi', size: 24 },
+  { density: 'hdpi', size: 36 },
+  { density: 'xhdpi', size: 48 },
+  { density: 'xxhdpi', size: 72 },
+  { density: 'xxxhdpi', size: 96 },
+];
+
+const NOTIFY_KIT_KEEP_FILE_NAME = 'notifykit_keep.xml';
+const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+
+function withNotifyKitAndroidNotificationIcons(config, icons) {
+  if (icons.length === 0) {
+    return config;
+  }
+
+  const { withDangerousMod } = requireExpoConfigPlugins();
+
+  return withDangerousMod(config, [
+    'android',
+    async modConfig => {
+      await generateNotifyKitAndroidNotificationIconResources(
+        modConfig.modRequest.projectRoot,
+        modConfig.modRequest.platformProjectRoot,
+        icons,
+      );
+
+      return modConfig;
+    },
+  ]);
+}
+
+async function generateNotifyKitAndroidNotificationIconResources(
+  projectRoot,
+  platformProjectRoot,
+  icons,
+) {
+  const normalizedIcons = normalizeAndroidNotificationIcons(icons);
+
+  if (normalizedIcons.length === 0) {
+    return;
+  }
+
+  const preparedIcons = normalizedIcons.map(icon => {
+    const sourcePath = resolveAndroidNotificationIconSource(projectRoot, icon);
+    validateAndroidNotificationIconPngSignature(icon, sourcePath);
+
+    return { icon, sourcePath };
+  });
+  const { resolvedPlatformProjectRoot, canonicalPlatformProjectRoot } =
+    resolveAndroidPlatformProjectRoot(platformProjectRoot);
+  const resourceRoot = path.join(resolvedPlatformProjectRoot, 'app', 'src', 'main', 'res');
+  const outputPaths = getAndroidNotificationIconOutputPaths(resourceRoot, preparedIcons);
+
+  validateAndroidOutputDestinations(
+    resolvedPlatformProjectRoot,
+    canonicalPlatformProjectRoot,
+    outputPaths,
+  );
+  validateAndroidResourceCollisions(resolvedPlatformProjectRoot, resourceRoot, preparedIcons);
+  validateKeepFileDestination(resourceRoot);
+
+  const generatedIcons = await generateAllAndroidNotificationIconBuffers(
+    projectRoot,
+    resourceRoot,
+    preparedIcons,
+  );
+
+  prepareAndroidOutputDirectories(
+    resolvedPlatformProjectRoot,
+    canonicalPlatformProjectRoot,
+    outputPaths,
+  );
+
+  for (const generatedIcon of generatedIcons) {
+    fs.writeFileSync(generatedIcon.outputPath, generatedIcon.source);
+  }
+
+  const keepFilePath = path.join(resourceRoot, 'raw', NOTIFY_KIT_KEEP_FILE_NAME);
+  fs.writeFileSync(keepFilePath, renderNotifyKitAndroidNotificationIconsKeepXml(normalizedIcons));
+}
+
+function renderNotifyKitAndroidNotificationIconsKeepXml(icons) {
+  const resources = icons.map(icon => `@drawable/${icon.name}`).join(',');
+
+  return (
+    '<?xml version="1.0" encoding="utf-8"?>\n' +
+    '<resources xmlns:tools="http://schemas.android.com/tools"\n' +
+    `    tools:keep="${resources}" />\n`
+  );
+}
+
+function resolveAndroidNotificationIconSource(projectRoot, icon) {
+  const resolvedProjectRoot = path.resolve(projectRoot);
+  const resolvedSourcePath = path.resolve(resolvedProjectRoot, icon.path);
+
+  if (!isPathInside(resolvedProjectRoot, resolvedSourcePath)) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source '${icon.path}' for '${icon.name}' ` +
+        'resolves outside the Expo project root.',
+    );
+  }
+
+  if (!fs.existsSync(resolvedSourcePath)) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source does not exist for '${icon.name}': ${resolvedSourcePath}`,
+    );
+  }
+
+  let sourceStats;
+  try {
+    sourceStats = fs.statSync(resolvedSourcePath);
+  } catch (error) {
+    throw new Error(
+      `[react-native-notify-kit] Unable to inspect android.icons source for '${icon.name}': ` +
+        `${resolvedSourcePath}. ${formatError(error)}`,
+    );
+  }
+
+  if (!sourceStats.isFile()) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source for '${icon.name}' must be a file: ${resolvedSourcePath}`,
+    );
+  }
+
+  try {
+    fs.accessSync(resolvedSourcePath, fs.constants.R_OK);
+  } catch (error) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source for '${icon.name}' is not readable: ` +
+        `${resolvedSourcePath}. ${formatError(error)}`,
+    );
+  }
+
+  const realProjectRoot = fs.realpathSync(resolvedProjectRoot);
+  const realSourcePath = fs.realpathSync(resolvedSourcePath);
+  if (!isPathInside(realProjectRoot, realSourcePath)) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source '${icon.path}' for '${icon.name}' ` +
+        'resolves outside the Expo project root through a symbolic link.',
+    );
+  }
+
+  return resolvedSourcePath;
+}
+
+function validateAndroidNotificationIconPngSignature(icon, sourcePath) {
+  let sourceHeader;
+  try {
+    sourceHeader = fs.readFileSync(sourcePath).subarray(0, PNG_SIGNATURE.length);
+  } catch (error) {
+    throw new Error(
+      `[react-native-notify-kit] Unable to read android.icons source content for '${icon.name}' ` +
+        `from '${icon.path}' (${sourcePath}): ${formatError(error)}`,
+    );
+  }
+
+  if (sourceHeader.length !== PNG_SIGNATURE.length || !sourceHeader.equals(PNG_SIGNATURE)) {
+    throw new Error(
+      `[react-native-notify-kit] android.icons source content for '${icon.name}' from ` +
+        `'${icon.path}' (${sourcePath}) is not a valid PNG: the PNG signature is missing.`,
+    );
+  }
+}
+
+function resolveAndroidPlatformProjectRoot(platformProjectRoot) {
+  const resolvedPlatformProjectRoot = path.resolve(platformProjectRoot);
+  let platformProjectRootStats;
+  let canonicalPlatformProjectRoot;
+
+  try {
+    platformProjectRootStats = fs.statSync(resolvedPlatformProjectRoot);
+    canonicalPlatformProjectRoot = fs.realpathSync(resolvedPlatformProjectRoot);
+  } catch (error) {
+    throw new Error(
+      `[react-native-notify-kit] Unable to inspect Android platform project root ` +
+        `${resolvedPlatformProjectRoot}: ${formatError(error)}`,
+    );
+  }
+
+  if (!platformProjectRootStats.isDirectory()) {
+    throw new Error(
+      `[react-native-notify-kit] Android platform project root is not a directory: ` +
+        resolvedPlatformProjectRoot,
+    );
+  }
+
+  return { resolvedPlatformProjectRoot, canonicalPlatformProjectRoot };
+}
+
+function getAndroidNotificationIconOutputPaths(resourceRoot, preparedIcons) {
+  const outputPaths = preparedIcons.flatMap(({ icon }) =>
+    ANDROID_NOTIFICATION_ICON_DENSITIES.map(({ density }) =>
+      path.join(resourceRoot, `drawable-${density}`, `${icon.name}.png`),
+    ),
+  );
+
+  outputPaths.push(path.join(resourceRoot, 'raw', NOTIFY_KIT_KEEP_FILE_NAME));
+  return outputPaths;
+}
+
+function validateAndroidOutputDestinations(
+  resolvedPlatformProjectRoot,
+  canonicalPlatformProjectRoot,
+  outputPaths,
+) {
+  for (const outputPath of outputPaths) {
+    validateAndroidOutputDestination(
+      resolvedPlatformProjectRoot,
+      canonicalPlatformProjectRoot,
+      outputPath,
+    );
+  }
+}
+
+function validateAndroidOutputDestination(
+  resolvedPlatformProjectRoot,
+  canonicalPlatformProjectRoot,
+  outputPath,
+) {
+  const resolvedOutputPath = path.resolve(outputPath);
+  if (!isPathInside(resolvedPlatformProjectRoot, resolvedOutputPath)) {
+    throw new Error(
+      `[react-native-notify-kit] Android output destination resolves outside the platform ` +
+        `project root: ${resolvedOutputPath}`,
+    );
+  }
+
+  const relativeOutputPath = path.relative(resolvedPlatformProjectRoot, resolvedOutputPath);
+  const pathComponents = relativeOutputPath.split(path.sep).filter(Boolean);
+  let currentPath = resolvedPlatformProjectRoot;
+
+  for (const [index, pathComponent] of pathComponents.entries()) {
+    currentPath = path.join(currentPath, pathComponent);
+    const currentStats = lstatAndroidOutputPathIfExists(currentPath);
+    if (currentStats === undefined) {
+      return;
+    }
+
+    if (currentStats.isSymbolicLink()) {
+      throw new Error(
+        `[react-native-notify-kit] Android output destination must not contain a symbolic link: ` +
+          currentPath,
+      );
+    }
+
+    const isFinalComponent = index === pathComponents.length - 1;
+    if (!isFinalComponent && !currentStats.isDirectory()) {
+      throw new Error(
+        `[react-native-notify-kit] Android output destination path component is not a directory: ` +
+          currentPath,
+      );
+    }
+
+    if (currentStats.isDirectory()) {
+      let canonicalDirectoryPath;
+      try {
+        canonicalDirectoryPath = fs.realpathSync(currentPath);
+      } catch (error) {
+        throw new Error(
+          `[react-native-notify-kit] Unable to resolve Android output directory ${currentPath}: ` +
+            formatError(error),
+        );
+      }
+
+      if (!isPathInside(canonicalPlatformProjectRoot, canonicalDirectoryPath)) {
+        throw new Error(
+          `[react-native-notify-kit] Android output directory resolves outside the canonical ` +
+            `platform project root: ${currentPath}`,
+        );
+      }
+    }
+  }
+}
+
+function lstatAndroidOutputPathIfExists(outputPath) {
+  try {
+    return fs.lstatSync(outputPath);
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return undefined;
+    }
+
+    throw new Error(
+      `[react-native-notify-kit] Unable to inspect Android output destination ${outputPath}: ` +
+        formatError(error),
+    );
+  }
+}
+
+function prepareAndroidOutputDirectories(
+  resolvedPlatformProjectRoot,
+  canonicalPlatformProjectRoot,
+  outputPaths,
+) {
+  const outputDirectories = [...new Set(outputPaths.map(outputPath => path.dirname(outputPath)))];
+  for (const outputDirectory of outputDirectories) {
+    fs.mkdirSync(outputDirectory, { recursive: true });
+  }
+
+  validateAndroidOutputDestinations(
+    resolvedPlatformProjectRoot,
+    canonicalPlatformProjectRoot,
+    outputPaths,
+  );
+}
+
+function validateAndroidResourceCollisions(platformProjectRoot, resourceRoot, preparedIcons) {
+  const sourceSetRoot = path.join(platformProjectRoot, 'app', 'src');
+  const mipmapDirectories = findResourceDirectories(sourceSetRoot, 'mipmap');
+
+  for (const { icon } of preparedIcons) {
+    for (const mipmapDirectory of mipmapDirectories) {
+      const collision = findLogicalResourceCollision(mipmapDirectory, icon.name);
+      if (collision !== undefined) {
+        throw new Error(
+          `[react-native-notify-kit] Android mipmap resource collision for '${icon.name}': ` +
+            `${collision}. Remove or rename the mipmap resource before generating a drawable icon.`,
+        );
+      }
+    }
+
+    for (const { density } of ANDROID_NOTIFICATION_ICON_DENSITIES) {
+      const drawableDirectory = path.join(resourceRoot, `drawable-${density}`);
+      validateDrawableDestination(drawableDirectory, icon.name);
+    }
+  }
+}
+
+function findResourceDirectories(sourceSetRoot, resourceType) {
+  if (!fs.existsSync(sourceSetRoot)) {
+    return [];
+  }
+
+  const directories = [];
+  for (const sourceSet of fs.readdirSync(sourceSetRoot, { withFileTypes: true })) {
+    if (!sourceSet.isDirectory()) {
+      continue;
+    }
+
+    const sourceSetResourceRoot = path.join(sourceSetRoot, sourceSet.name, 'res');
+    if (
+      !fs.existsSync(sourceSetResourceRoot) ||
+      !fs.statSync(sourceSetResourceRoot).isDirectory()
+    ) {
+      continue;
+    }
+
+    for (const qualifier of fs.readdirSync(sourceSetResourceRoot, { withFileTypes: true })) {
+      if (
+        qualifier.isDirectory() &&
+        (qualifier.name === resourceType || qualifier.name.startsWith(`${resourceType}-`))
+      ) {
+        directories.push(path.join(sourceSetResourceRoot, qualifier.name));
+      }
+    }
+  }
+
+  return directories;
+}
+
+function findLogicalResourceCollision(resourceDirectory, resourceName) {
+  for (const entry of fs.readdirSync(resourceDirectory, { withFileTypes: true })) {
+    if (
+      (entry.isFile() || entry.isSymbolicLink()) &&
+      hasLogicalResourceName(entry.name, resourceName)
+    ) {
+      return path.join(resourceDirectory, entry.name);
+    }
+  }
+
+  return undefined;
+}
+
+function validateDrawableDestination(drawableDirectory, resourceName) {
+  if (!fs.existsSync(drawableDirectory)) {
+    return;
+  }
+
+  if (!fs.statSync(drawableDirectory).isDirectory()) {
+    throw new Error(
+      `[react-native-notify-kit] Android drawable destination is not a directory: ${drawableDirectory}`,
+    );
+  }
+
+  const exactPngName = `${resourceName}.png`;
+  for (const entry of fs.readdirSync(drawableDirectory, { withFileTypes: true })) {
+    if (!hasLogicalResourceName(entry.name, resourceName)) {
+      continue;
+    }
+
+    const collisionPath = path.join(drawableDirectory, entry.name);
+    if (entry.name === exactPngName && entry.isFile()) {
+      continue;
+    }
+
+    throw new Error(
+      `[react-native-notify-kit] Android drawable resource collision for '${resourceName}': ` +
+        `${collisionPath}. Only the exact ${exactPngName} destination may be overwritten.`,
+    );
+  }
+}
+
+function validateKeepFileDestination(resourceRoot) {
+  const rawDirectory = path.join(resourceRoot, 'raw');
+  if (fs.existsSync(rawDirectory) && !fs.statSync(rawDirectory).isDirectory()) {
+    throw new Error(
+      `[react-native-notify-kit] Android raw resource destination is not a directory: ${rawDirectory}`,
+    );
+  }
+
+  const keepFilePath = path.join(rawDirectory, NOTIFY_KIT_KEEP_FILE_NAME);
+  if (fs.existsSync(keepFilePath) && !fs.statSync(keepFilePath).isFile()) {
+    throw new Error(
+      `[react-native-notify-kit] NotifyKit keep file destination is not a file: ${keepFilePath}`,
+    );
+  }
+}
+
+async function generateAllAndroidNotificationIconBuffers(projectRoot, resourceRoot, preparedIcons) {
+  const generatedIcons = [];
+
+  for (const { icon, sourcePath } of preparedIcons) {
+    for (const { density, size } of ANDROID_NOTIFICATION_ICON_DENSITIES) {
+      try {
+        const generatedImage = await generateImageAsync(
+          { projectRoot },
+          {
+            src: sourcePath,
+            name: `${icon.name}.png`,
+            width: size,
+            height: size,
+            resizeMode: 'cover',
+            backgroundColor: 'transparent',
+          },
+        );
+
+        generatedIcons.push({
+          outputPath: path.join(resourceRoot, `drawable-${density}`, `${icon.name}.png`),
+          source: generatedImage.source,
+        });
+      } catch (error) {
+        throw new Error(
+          `[react-native-notify-kit] Unable to generate Android notification icon '${icon.name}' ` +
+            `from '${icon.path}' at ${size}x${size}: ${formatError(error)}`,
+        );
+      }
+    }
+  }
+
+  return generatedIcons;
+}
+
+function hasLogicalResourceName(fileName, resourceName) {
+  return fileName === resourceName || fileName.startsWith(`${resourceName}.`);
+}
+
+function isPathInside(parentPath, childPath) {
+  const relativePath = path.relative(parentPath, childPath);
+
+  return (
+    relativePath === '' ||
+    (relativePath !== '..' &&
+      !relativePath.startsWith(`..${path.sep}`) &&
+      !path.isAbsolute(relativePath))
+  );
+}
+
+function formatError(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function requireExpoConfigPlugins() {
+  try {
+    return require('expo/config-plugins');
+  } catch (error) {
+    try {
+      return require(require.resolve('expo/config-plugins', { paths: [process.cwd()] }));
+    } catch {
+      throw error;
+    }
+  }
+}
+
+module.exports = {
+  ANDROID_NOTIFICATION_ICON_DENSITIES,
+  withNotifyKitAndroidNotificationIcons,
+  generateNotifyKitAndroidNotificationIconResources,
+  renderNotifyKitAndroidNotificationIconsKeepXml,
+};

package/plugin/build/index.js

@@ -2,33 +2,28 @@
 
 const { createRunOncePlugin } = requireExpoConfigPlugins();
 const { normalizeNotifyKitPluginOptions } = require('./options');
+const { withNotifyKitAndroidManifest } = require('./android/withNotifyKitAndroidManifest');
 const {
-  withNotifyKitAndroidManifest,
-} = require('./android/withNotifyKitAndroidManifest');
-const {
-  withNotifyKitIosNseAppExtension,
-} = require('./ios/withNotifyKitIosNseAppExtension');
-const {
-  withNotifyKitIosNseFiles,
-} = require('./ios/withNotifyKitIosNseFiles');
-const {
-  withNotifyKitIosNsePodfile,
-} = require('./ios/withNotifyKitIosNsePodfile');
-const {
-  withNotifyKitIosNseXcodeProject,
-} = require('./ios/withNotifyKitIosNseXcodeProject');
+  withNotifyKitAndroidNotificationIcons,
+} = require('./android/withNotifyKitAndroidNotificationIcons');
+const { withNotifyKitIosNseAppExtension } = require('./ios/withNotifyKitIosNseAppExtension');
+const { withNotifyKitIosNseFiles } = require('./ios/withNotifyKitIosNseFiles');
+const { withNotifyKitIosNsePodfile } = require('./ios/withNotifyKitIosNsePodfile');
+const { withNotifyKitIosNseXcodeProject } = require('./ios/withNotifyKitIosNseXcodeProject');
 const pkg = require('../../package.json');
 
 function withNotifyKit(config, props = {}) {
   const options = normalizeNotifyKitPluginOptions(props);
   const foregroundServiceOptions = options.android.foregroundService;
+  const notificationIcons = options.android.icons;
   const nseOptions = options.ios.notificationServiceExtension;
-  const configWithAndroidManifest = withNotifyKitAndroidManifest(
-    config,
-    foregroundServiceOptions,
+  const configWithAndroidManifest = withNotifyKitAndroidManifest(config, foregroundServiceOptions);
+  const configWithAndroidNotificationIcons = withNotifyKitAndroidNotificationIcons(
+    configWithAndroidManifest,
+    notificationIcons,
   );
   const configWithAppExtension = withNotifyKitIosNseAppExtension(
-    configWithAndroidManifest,
+    configWithAndroidNotificationIcons,
     nseOptions,
   );
   const configWithFiles = withNotifyKitIosNseFiles(configWithAppExtension, nseOptions);

package/plugin/build/options.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const path = require('path');
+
 const DEFAULT_IOS_NSE_TARGET_NAME = 'NotifyKitNSE';
 const DEFAULT_IOS_NSE_BUNDLE_SUFFIX = '.NotifyKitNSE';
 
@@ -21,6 +23,7 @@ const ANDROID_FOREGROUND_SERVICE_TYPES = [
 
 const TARGET_NAME_PATTERN = /^[A-Za-z0-9_\-.]+$/;
 const BUNDLE_SUFFIX_PATTERN = /^\.[A-Za-z0-9\-.]+$/;
+const ANDROID_RESOURCE_NAME_PATTERN = /^[a-z][a-z0-9_]*$/;
 
 function normalizeNotifyKitPluginOptions(options = {}) {
   return {
@@ -33,6 +36,7 @@ function normalizeNotifyKitPluginOptions(options = {}) {
       foregroundService: normalizeAndroidForegroundServiceOptions(
         options.android && options.android.foregroundService,
       ),
+      icons: normalizeAndroidNotificationIcons(options.android && options.android.icons),
     },
   };
 }
@@ -152,6 +156,85 @@ function disabledAndroidForegroundServiceOptions() {
   };
 }
 
+function normalizeAndroidNotificationIcons(input) {
+  if (input === undefined) {
+    return [];
+  }
+
+  if (!Array.isArray(input)) {
+    throw new Error('[react-native-notify-kit] android.icons must be an array.');
+  }
+
+  const names = new Set();
+  const icons = [];
+
+  for (const [index, value] of input.entries()) {
+    if (!isPlainObject(value)) {
+      throw new Error(`[react-native-notify-kit] android.icons[${index}] must be an object.`);
+    }
+
+    if (typeof value.name !== 'string' || value.name.trim().length === 0) {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].name must be a non-empty string.`,
+      );
+    }
+
+    if (!ANDROID_RESOURCE_NAME_PATTERN.test(value.name)) {
+      throw new Error(
+        `[react-native-notify-kit] Invalid android.icons[${index}].name '${value.name}'. ` +
+          'It must start with a lowercase letter and contain only lowercase letters, digits, and underscores.',
+      );
+    }
+
+    if (typeof value.path !== 'string' || value.path.trim().length === 0) {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].path must be a non-empty string.`,
+      );
+    }
+
+    if (path.isAbsolute(value.path) || path.win32.isAbsolute(value.path)) {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].path must be project-relative.`,
+      );
+    }
+
+    if (path.extname(value.path) !== '.png') {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].path must reference a lowercase .png file.`,
+      );
+    }
+
+    if (typeof value.type !== 'string') {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].type must be the string 'small'.`,
+      );
+    }
+
+    if (value.type !== 'small') {
+      throw new Error(
+        `[react-native-notify-kit] android.icons[${index}].type '${value.type}' is unsupported. ` +
+          "Only 'small' is supported.",
+      );
+    }
+
+    if (names.has(value.name)) {
+      throw new Error(
+        `[react-native-notify-kit] Duplicate android.icons name '${value.name}'. ` +
+          'Each Android notification icon name must be unique.',
+      );
+    }
+
+    names.add(value.name);
+    icons.push({
+      name: value.name,
+      path: value.path,
+      type: value.type,
+    });
+  }
+
+  return icons;
+}
+
 function normalizeAndroidForegroundServiceTypes(input) {
   if (!Array.isArray(input)) {
     throw new Error(
@@ -221,4 +304,5 @@ module.exports = {
   normalizeNotifyKitPluginOptions,
   normalizeIosNotificationServiceExtensionOptions,
   normalizeAndroidForegroundServiceOptions,
+  normalizeAndroidNotificationIcons,
 };

package/server/README.md

@@ -24,6 +24,8 @@ const message = buildNotifyKitPayload({
     android: {
       channelId: 'orders',
       smallIcon: 'ic_notification',
+      showTimestamp: true,
+      timestamp: Date.now(),
       pressAction: { id: 'open-order' },
     },
     ios: {
@@ -44,6 +46,8 @@ await admin.messaging().send(message);
 
 `options.ttl` is expressed in seconds. Pass the message directly to Firebase Admin without an adapter or a manual unit conversion.
 
+Android `showTimestamp` and `timestamp` stay inside the `_v: 1` `notifee_options` blob and are reconstructed client-side using the existing Android notification semantics. They are not Firebase Admin `android.notification` fields; the Android message remains data-only.
+
 ## API
 
 ### `buildNotifyKitPayload(input: NotifyKitPayloadInput): NotifyKitPayloadOutput`

package/src/fcm/reconstructNotification.ts

@@ -7,6 +7,7 @@ import { Notification } from '../types/Notification';
 import { NotificationAndroid, AndroidStyle } from '../types/NotificationAndroid';
 import { NotificationIOS } from '../types/NotificationIOS';
 import { isAndroid, isIOS } from '../utils';
+import { isValidTimestamp } from '../validators/validate';
 import type { FcmConfig, FcmRemoteMessage } from './types';
 import type { ParsedPayload } from './parseFcmPayload';
 
@@ -126,6 +127,12 @@ function buildAndroidConfig(
   if (typeof raw?.largeIcon === 'string') android.largeIcon = raw.largeIcon;
   if (typeof raw?.color === 'string') android.color = raw.color;
 
+  // Timestamp fields — preserve only values accepted by the canonical Android validator
+  if (typeof raw?.showTimestamp === 'boolean') android.showTimestamp = raw.showTimestamp;
+  if (typeof raw?.timestamp === 'number' && isValidTimestamp(raw.timestamp)) {
+    android.timestamp = raw.timestamp;
+  }
+
   // Actions array — pass through (trust server validation)
   if (Array.isArray(raw?.actions)) {
     android.actions = raw.actions as NotificationAndroid['actions'];

package/src/internal/fcmContract.d.ts

@@ -35,6 +35,8 @@ export type NotifyKitAndroidConfig = {
   pressAction?: NotifyKitPressAction;
   actions?: NotifyKitAndroidAction[];
   style?: NotifyKitAndroidStyle;
+  showTimestamp?: boolean;
+  timestamp?: number;
 };
 
 export type NotifyKitIosAttachment = {

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '10.6.0';
+export const version = '10.7.1';