Merge upstream develop

Author: github-actions[bot]

.gitlab/ci/build_services.yml

@@ -15,6 +15,11 @@
     - cargo clippy --package ${SERVICE_NAME} -- -D warnings
   allow_failure: true
 
+.service-test:
+  extends: .service-rust-base
+  script:
+    - cargo test --package ${SERVICE_NAME}
+
 .service-build:
   extends: .service-rust-base
   stage: build
@@ -151,4 +156,62 @@ moderation-image:
     - .service-image
   rules:
     - !reference [.moderation-workflow, rules]
-    - !reference [.release-workflow, rules]
+    - !reference [.release-workflow, rules]
+
+########################################################################
+# notifications
+########################################################################
+
+.notifications-workflow:
+  image: gitlab.futo.org:5050/devops/manifest-repo/library/docker:latest
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^notifications-/
+      when: always
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - Cargo.toml
+        - Cargo.lock
+        - services/notifications/**/*
+        - services/common/**/*
+        - .gitlab/ci/build_services.yml
+        - .gitlab/ci/deploy_services.yml
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - services/notifications/**/*
+        - services/common/**/*
+        - .gitlab/ci/build_services.yml
+        - .gitlab/ci/deploy_services.yml
+  variables:
+    RUNNER_SCRIPT_TIMEOUT: 179m
+    SERVICE_NAME: notifications-service
+    SERVICE_DIR: notifications
+
+notifications-format-check:
+  extends:
+    - .notifications-workflow
+    - .service-format-check
+
+notifications-clippy:
+  extends:
+    - .notifications-workflow
+    - .service-clippy
+
+notifications-test:
+  extends:
+    - .notifications-workflow
+    - .service-test
+
+notifications-build:
+  extends:
+    - .notifications-workflow
+    - .service-build
+
+notifications-image:
+  extends:
+    - .notifications-workflow
+    - .service-image
+  rules:
+    - !reference [.notifications-workflow, rules]
+    - !reference [.release-workflow, rules]

.gitlab/ci/deploy_pages.yml

@@ -1,6 +1,6 @@
 fusmi-2026-web:
   stage: deploy
-  image: node:20
+  image: node:24
   rules:
     - if: $CI_COMMIT_TAG == "fusmi-2026-web"
   before_script:

.gitlab/ci/deploy_services.yml

@@ -118,4 +118,47 @@ moderation-deploy-manifest-production:
   variables:
     MANIFEST_QUICK_TARGETS: inventory/polycentric-east/moderation.yml:polycentriceast
   needs:
-    - moderation-deploy-image-production
+    - moderation-deploy-image-production
+
+########################################################################
+# notifications
+########################################################################
+
+.notifications-deploy-workflow:
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - services/notifications/**/*
+        - services/common/**/*
+        - .gitlab/ci/build_services.yml
+        - .gitlab/ci/deploy_services.yml
+  variables:
+    SERVICE_NAME: notifications-service
+
+########################################
+# Tag the image with environment label #
+########################################
+
+notifications-deploy-image-production:
+  extends:
+    - .notifications-deploy-workflow
+    - .service-deploy-image
+  when: manual
+  variables:
+    ENVIRONMENT: production
+  needs:
+    - job: notifications-image
+      artifacts: false
+
+###############################
+# Rolling restart on Manifest #
+###############################
+
+notifications-deploy-manifest-production:
+  extends:
+    - .notifications-deploy-workflow
+    - .service-deploy-manifest
+  variables:
+    MANIFEST_QUICK_TARGETS: inventory/polycentric-east/notifications.yml:polycentriceast
+  needs:
+    - notifications-deploy-image-production

.nvmrc

@@ -1 +1 @@
-v24.14.0
+24.16.0

Cargo.toml

@@ -5,6 +5,7 @@ members = [
     "services/server",
     "services/server/tests",
     "services/moderation",
+    "services/notifications",
     "services/common/*",
     "tools/identity",
 ]

apps/polycentric/.env.example

@@ -5,6 +5,16 @@
 # ServerService.GetInfo, so only the gRPC endpoint(s) need to be set.
 EXPO_PUBLIC_POLYCENTRIC_SEED_SERVERS=http://localhost:3000
 
+# Comma-separated gRPC-web URLs of the notifications service the client
+# registers Expo push tokens with. Falls back to `http://<host>:3001`.
+EXPO_PUBLIC_POLYCENTRIC_NOTIFICATION_SERVERS=http://localhost:3001
+
 # Host Metro and the app resolve `localhost` against. Set to your dev
 # machine's LAN IP when running on a physical device/emulator.
 REACT_NATIVE_PACKAGER_HOSTNAME=localhost
+
+# Path to the Firebase `google-services.json` used for Android push
+# notifications. Defaults to `./google-services.json` (this directory)
+# when unset; If no google services file is present, Android push 
+# notifications will not work.
+GOOGLE_SERVICES_JSON=./google-services.json

apps/polycentric/app.config.ts

@@ -1,4 +1,5 @@
-import type { ExpoConfig, ConfigContext } from 'expo/config';
+import type { ConfigContext, ExpoConfig } from 'expo/config';
+import fs from 'fs';
 
 const { version: PKG_VERSION } = require('./package.json');
 
@@ -7,6 +8,10 @@ const IS_DEV = process.env.APP_VARIANT === 'dev';
 const NAME = IS_DEV ? 'Polycentric Dev' : 'Polycentric';
 const ID = IS_DEV ? 'org.futo.polycentric.dev' : 'org.futo.polycentric';
 
+const GOOGLE_SERVICES_FILE =
+  process.env.GOOGLE_SERVICES_JSON ?? './google-services.json';
+const HAS_GOOGLE_SERVICES = fs.existsSync(GOOGLE_SERVICES_FILE);
+
 export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   name: NAME,
@@ -32,9 +37,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       NSCameraUsageDescription: '$(PRODUCT_NAME) needs access to your Camera.',
       ITSAppUsesNonExemptEncryption: false,
     },
-    entitlements: {
-      'aps-environment': 'production',
-    },
   },
   android: {
     adaptiveIcon: {
@@ -48,6 +50,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     },
     package: ID,
     permissions: ['android.permission.CAMERA'],
+    ...(HAS_GOOGLE_SERVICES && { googleServicesFile: GOOGLE_SERVICES_FILE }),
   },
   plugins: [
     'expo-router',

apps/polycentric/src/common/components/layout/Layout.tsx

@@ -352,7 +352,7 @@ export const RightSidebar = memo(function RightSidebar({
               style={({ pressed }) => [pressed && { opacity: 0.65 }]}
             >
               <Icon
-                name={theme.name === 'dark' ? 'themeDark' : 'themeLight'}
+                name={theme.name === 'dark' ? 'themeLight' : 'themeDark'}
                 size={typography.fontSize.sm}
                 color="neutral_500"
               />

apps/polycentric/src/common/lib/notifications/registerPushToken.ts

@@ -3,8 +3,22 @@ import * as Device from 'expo-device';
 import * as Notifications from 'expo-notifications';
 import { Platform } from 'react-native';
 
+// Without a handler, expo-notifications silently delivers pushes while the
+// app is foregrounded — the OS suppresses the banner/sound. Setting this
+// at module load (rather than inside a component) ensures it's registered
+// before the first notification arrives.
+Notifications.setNotificationHandler({
+  handleNotification: async () => ({
+    shouldShowBanner: true,
+    shouldShowList: true,
+    shouldPlaySound: true,
+    shouldSetBadge: false,
+  }),
+});
+
 export async function registerForPushNotifications(): Promise<string | null> {
-  if (Platform.OS === 'web' || !Device.isDevice) return null;
+  if (Platform.OS === 'web') return null;
+  if (!Device.isDevice && !__DEV__) return null;
 
   if (Platform.OS === 'android') {
     await Notifications.setNotificationChannelAsync('default', {

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -59,6 +59,24 @@ export const DEFAULT_SEED_SERVERS: string[] = (() => {
 /** First seed server — used by identity onboarding helpers. */
 export const DEFAULT_SERVER = DEFAULT_SEED_SERVERS[0]!;
 
+/**
+ * Comma-separated list of gRPC-web URLs for the notification service the
+ * client registers push tokens with. Read from
+ * `EXPO_PUBLIC_POLYCENTRIC_NOTIFICATION_SERVERS`; falls back to
+ * `http://<host>:3001` for local dev (the notifications service's default
+ * gRPC port).
+ */
+export const DEFAULT_NOTIFICATION_SERVERS: string[] = (() => {
+  const raw = (
+    process.env.EXPO_PUBLIC_POLYCENTRIC_NOTIFICATION_SERVERS ?? ''
+  ).trim();
+  const parsed = raw
+    .split(',')
+    .map((s) => s.trim())
+    .filter((s) => s.length > 0);
+  return parsed.length > 0 ? parsed : [`http://${DEFAULT_HOST}:3001`];
+})();
+
 interface PolycentricProviderProps {
   children: ReactNode;
   loadingComponent?: ReactNode;
@@ -132,7 +150,7 @@ export function PolycentricProvider({
       try {
         const token = await registerForPushNotifications();
         if (!token) return;
-        await client.registerPushNotifications(DEFAULT_SEED_SERVERS, {
+        await client.registerPushNotifications(DEFAULT_NOTIFICATION_SERVERS, {
           service: 'expo',
           token,
         });