From fbb789dbaee65519d1aef6a8a83027eb9c99e44b Mon Sep 17 00:00:00 2001
From: pietro-maximoff <pietro.maxim.official@protonmail.com>
Date: Mon, 9 Dec 2024 10:05:47 +0100
Subject: [PATCH 1/2] SOV-4618: Adjust governor in proclamation proposals

---
 .../components/ProposalDataForm/ProposalDataForm.tsx   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/frontend/src/app/5_pages/BitocracyPage/components/NewProposalForm/components/ProposalDataForm/ProposalDataForm.tsx b/apps/frontend/src/app/5_pages/BitocracyPage/components/NewProposalForm/components/ProposalDataForm/ProposalDataForm.tsx
index 7c7d3c45c..2b0adca2d 100644
--- a/apps/frontend/src/app/5_pages/BitocracyPage/components/NewProposalForm/components/ProposalDataForm/ProposalDataForm.tsx
+++ b/apps/frontend/src/app/5_pages/BitocracyPage/components/NewProposalForm/components/ProposalDataForm/ProposalDataForm.tsx
@@ -62,7 +62,6 @@ export const ProposalDataForm: FC<ProposalDataFormProps> = ({
     details: form,
     setDetails: setForm,
   } = useProposalContext();
-  const [governorOwner, setGovernorOwner] = useState('');
   const [index, setIndex] = useState(0);
   const handleInputChangeInput = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
@@ -147,13 +146,12 @@ export const ProposalDataForm: FC<ProposalDataFormProps> = ({
   );
 
   useEffect(() => {
-    if (proposalType === ProposalCreationType.Proclamation && !governorOwner) {
-      getProtocolContract(Governor.Admin, RSK_CHAIN_ID).then(owner => {
-        setGovernorOwner(owner.address);
-        setGovernor(owner.address);
+    if (proposalType === ProposalCreationType.Proclamation) {
+      getProtocolContract(Governor.Admin, RSK_CHAIN_ID).then(admin => {
+        setGovernor(admin.address);
       });
     }
-  }, [governorOwner, proposalType, setGovernor, setGovernorOwner]);
+  }, [proposalType, setGovernor]);
 
   return (
     <div className="flex flex-col gap-8 relative pb-4">

From 4a85097312b346fb7202988e0f40773d72e294ef Mon Sep 17 00:00:00 2001
From: Pietro <74987028+pietro-maximoff@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:07:31 +0100
Subject: [PATCH 2/2] Create brave-bees-cheer.md

---
 .changeset/brave-bees-cheer.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/brave-bees-cheer.md

diff --git a/.changeset/brave-bees-cheer.md b/.changeset/brave-bees-cheer.md
new file mode 100644
index 000000000..f066879db
--- /dev/null
+++ b/.changeset/brave-bees-cheer.md
@@ -0,0 +1,5 @@
+---
+"frontend": patch
+---
+
+SOV-4618: Adjust governor in proclamation proposals