Merge pull request #36 from IntersectMBO/BugFix-#2447

Bug fix #2447 #2264
IntersectMBO · Dec 2, 2024 · f7bbca0 · f7bbca0
2 parents ba4f580 + 4718786
commit f7bbca0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pdf-ui/CHANGELOG.md b/pdf-ui/CHANGELOG.md
@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
+## [v0.5.2](https://www.npmjs.com/package/@intersect.mbo/pdf-ui/v/0.5.2) 2024-12-02
+
+### Added -
+### Fixed -
+   - Changed params for submitting GA so now it is change to multiple addresses. [issue #2447](https://github.com/IntersectMBO/govtool/issues/2447)
+  - After successful submission of GA  modal close button will redirect to dashboard instead of allowing to submit again.[issue #2264](https://github.com/IntersectMBO/govtool/issues/2264)
+### Changed -
+### Removed -
+
 ## [v0.5.1](https://www.npmjs.com/package/@intersect.mbo/pdf-ui/v/0.5.1) 2024-11-29
 
 ### Added -
@@ -32,4 +41,5 @@ changes.
 ### Added - 
 ### Fixed -
 ### Changed -
-### Removed -
+### Removed -
+
diff --git a/pdf-ui/src/components/SubmissionGovernanceAction/Modals/GovernanceActionSubmittedModal.jsx b/pdf-ui/src/components/SubmissionGovernanceAction/Modals/GovernanceActionSubmittedModal.jsx
@@ -39,7 +39,7 @@ const GovernanceActionSubmittedModal = ({ open, onClose }) => {
                         alignItems={'center'}
                     >
                         <IconButton
-                            onClick={onClose}
+                            onClick={() => navigate('/proposal_discussion')}
                             data-testid='ga-submitted-modal-close-button'
                         >
                             <IconX width='24px' height='24px' />

diff --git a/pdf-ui/src/components/SubmissionGovernanceAction/Steps/InformationStorageStep.jsx b/pdf-ui/src/components/SubmissionGovernanceAction/Steps/InformationStorageStep.jsx
@@ -140,10 +140,7 @@ const InformationStorageStep = ({ proposal, handleCloseSubmissionDialog }) => {
                         await walletAPI.buildTreasuryGovernanceAction({
                             hash: hashData,
                             url: fileURL,
-                            amount: proposal?.attributes?.content?.attributes?.prop_amount?.toString(),
-                            receivingAddress:
-                                proposal?.attributes?.content?.attributes
-                                    ?.prop_receiving_address,
+                            withdrawals: getWithdrawalsArray()
                         });
                 }
 
@@ -183,6 +180,15 @@ const InformationStorageStep = ({ proposal, handleCloseSubmissionDialog }) => {
         }
     };
 
+    const getWithdrawalsArray = () => {
+        let withdrawalsArray = [];
+        let x = proposal?.attributes?.content?.attributes?.proposal_withdrawals.forEach((withdrawal) =>
+        {
+            withdrawalsArray.push({receivingAddress:withdrawal.prop_receiving_address,amount:withdrawal.prop_amount.toString()})
+        });
+        return withdrawalsArray;
+    }
+
     const handleDownloadJsonLD = () => {
         const blob = new Blob([JSON.stringify(jsonLdData, null, 2)], {
             type: 'application/ld+json',