Merge branch 'master' of https://github.com/MikesGlitch/actual into e…

…lectron/sync-server-embedded
actualbudget · Mar 4, 2025 · 68a61dd · 68a61dd
2 parents bab44f2 + e0805c1
commit 68a61dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx b/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx
@@ -71,7 +71,7 @@ function updateScheduleConditions(
       return { ...cond, value };
     }
 
-    if (value != null) {
+    if (value != null || field === 'payee') {
       return { op, field, value };
     }
 

diff --git a/packages/sync-server/src/load-config.js b/packages/sync-server/src/load-config.js
@@ -64,8 +64,8 @@ const configSchema = convict({
   port: {
     doc: 'Port to run the server on.',
     format: 'port',
-    default: 5006,
-    env: ['ACTUAL_PORT', 'PORT'],
+    default: process.env.PORT ? process.env.PORT : 5006,
+    env: 'ACTUAL_PORT',
   },
   hostname: {
     doc: 'Server hostname.',

diff --git a/upcoming-release-notes/4267.md b/upcoming-release-notes/4267.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Add "payee is nothing" condition to rule if there is no payee set in a schedule
diff --git a/upcoming-release-notes/4537.md b/upcoming-release-notes/4537.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+Fix for ACTUAL_PORT and PORT vars