Merge pull request #10722 from firefly-iii/release-1754590638

🤖 Automatically merge the PR into the develop branch.

app/Http/Controllers/Recurring/EditController.php

@@ -34,6 +34,7 @@ use FireflyIII\Models\RecurrenceRepetition;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Support\Facades\ExpandedForm;
 use FireflyIII\Support\JsonApi\Enrichments\RecurringEnrichment;
 use FireflyIII\Transformers\RecurrenceTransformer;
 use FireflyIII\User;
@@ -106,8 +107,8 @@ class EditController extends Controller
         $transformer->setParameters(new ParameterBag());
 
         $array                            = $transformer->transform($recurrence);
-        $budgets                          = app('expandedform')->makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
-        $bills                            = app('expandedform')->makeSelectListWithEmpty($this->billRepository->getActiveBills());
+        $budgets                          = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
+        $bills                            = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills());
 
         /** @var RecurrenceRepetition $repetition */
         $repetition                       = $recurrence->recurrenceRepetitions()->first();

app/Transformers/BudgetTransformer.php

@@ -106,8 +106,8 @@ class BudgetTransformer extends AbstractTransformer
 
             'auto_budget_amount'              => $abAmount,
             'pc_auto_budget_amount'           => $abPrimary,
-            'spent'                           => $this->beautify($budget->meta['spent']),
-            'pc_spent'                        => $this->beautify($budget->meta['pc_spent']),
+            'spent'                           => null === $budget->meta['spent'] ? null : $this->beautify($budget->meta['spent']),
+            'pc_spent'                        => null === $budget->meta['pc_spent'] ? null : $this->beautify($budget->meta['pc_spent']),
             'links'                           => [
                 [
                     'rel' => 'self',

app/Transformers/RecurrenceTransformer.php

@@ -67,7 +67,7 @@ class RecurrenceTransformer extends AbstractTransformer
             'nr_of_repetitions' => $reps,
             'notes'             => $recurrence->meta['notes'],
             'repetitions'       => $recurrence->meta['repetitions'],
-            'new_transactions'  => $recurrence->meta['transactions'],
+            'transactions'      => $recurrence->meta['transactions'],
             'links'             => [
                 [
                     'rel' => 'self',

config/firefly.php

@@ -79,7 +79,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2025-08-07',
-    'build_time'                   => 1754589772,
+    'build_time'                   => 1754590535,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

package-lock.json

@@ -7838,9 +7838,9 @@
             }
         },
         "node_modules/launch-editor": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.11.0.tgz",
-            "integrity": "sha512-R/PIF14L6e2eHkhvQPu7jDRCr0msfCYCxbYiLgkkAGi0dVPWuM+RrsPu0a5dpuNe0KWGL3jpAkOlv53xGfPheQ==",
+            "version": "2.11.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.11.1.tgz",
+            "integrity": "sha512-SEET7oNfgSaB6Ym0jufAdCeo3meJVeCaaDyzRygy0xsp2BFKCprcfHljTq4QkzTLUxEKkFK6OK4811YM2oSrRg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {