From 9d057b853f4c31b522cb30764379553538599cf9 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Wed, 21 Jun 2023 07:30:08 +0200
Subject: [PATCH] Rule edit form: rule group would always select the top one.

---
 app/Support/Form/RuleForm.php        | 14 +++++++-------
 resources/views/rules/rule/edit.twig |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Support/Form/RuleForm.php b/app/Support/Form/RuleForm.php
index c20d8e49ce..e985fd6576 100644
--- a/app/Support/Form/RuleForm.php
+++ b/app/Support/Form/RuleForm.php
@@ -37,13 +37,13 @@ class RuleForm
     use FormSupport;
 
     /**
-     * @param  string  $name
-     * @param  mixed  $value
-     * @param  array|null  $options
+     * @param string $name
+     * @param mixed $value
+     * @param array|null $options
      *
      * @return string
      */
-    public function ruleGroupList(string $name, $value = null, array $options = null): string
+    public function ruleGroupList(string $name, mixed $value = null, array $options = null): string
     {
         /** @var RuleGroupRepositoryInterface $groupRepos */
         $groupRepos = app(RuleGroupRepositoryInterface::class);
@@ -60,9 +60,9 @@ class RuleForm
     }
 
     /**
-     * @param  string  $name
-     * @param  null  $value
-     * @param  array|null  $options
+     * @param string $name
+     * @param null $value
+     * @param array|null $options
      *
      * @return HtmlString
      */
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 53d1cf8739..2ee6ca7fc9 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -18,7 +18,7 @@
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title', rule.title) }}
-                        {{ RuleForm.ruleGroupList('rule_group_id', ruleGroup.id) }}
+                        {{ RuleForm.ruleGroupList('rule_group_id', rule.rule_group_id) }}
                         {{ ExpandedForm.select('trigger',allJournalTriggers(), primaryTrigger) }}
 
                         {# only correct way to do active checkbox #}