Merge branch 'main' into OSDEV-1789-search-result-scrolls-from-bottom

# Conflicts:
#	doc/release/RELEASE-NOTES.md

Author: roman-stolar

doc/release/RELEASE-NOTES.md

@@ -3,14 +3,15 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). The format is based on the `RELEASE-NOTES-TEMPLATE.md` file.
 
-## Release 1.32
 
+## Release 1.32.0
 ## Introduction
 * Product name: Open Supply Hub
 * Release date: March 22, 2025
 
 ### Bugfix
 * [OSDEV-1806](https://opensupplyhub.atlassian.net/browse/OSDEV-1806) - Refactored the Parent Company field validation. The field is now validated as a regular character field.
+* [OSDEV-1787](https://opensupplyhub.atlassian.net/browse/OSDEV-1787) - The tooltip messages for the Claim button have been removed for all statuses of moderation events on the `Contribution Record` page and changed according to the design on `Thanks for adding data for this production location` pop-up.
 * [OSDEV-1789](https://opensupplyhub.atlassian.net/browse/OSDEV-1789) - Fixed an issue where the scroll position was not resetting to the top when navigating through SLC workflow pages.
 
 ### Release instructions:

src/react/src/__tests__/components/DashboardContributionRecord.test.js

@@ -277,7 +277,7 @@ describe('DashboardContributionRecord component', () => {
         },
       ],
     };
-  
+
     const { reduxStore } = renderComponent();
     reduxStore.dispatch(completeFetchPotentialMatches(matches));
 

src/react/src/components/Contribute/ProductionLocationDialog.jsx

@@ -76,9 +76,10 @@ const getTooltipText = claimStatus => {
         return 'Production location has been claimed already.';
     }
     if (claimStatus === PRODUCTION_LOCATION_CLAIM_STATUSES_ENUM.PENDING) {
-        return "You'll be able to claim the location after the moderation is done";
+        return 'There is a pending claim for this production location.';
     }
-    return 'Claim is not available.';
+
+    return "You'll be able to claim the location after the moderation is done.";
 };
 
 const ProductionLocationDialog = ({

src/react/src/components/Dashboard/DashboardContributionRecord.jsx

@@ -180,24 +180,6 @@ const DashboardContributionRecord = ({
     const isDisabled =
         moderationEventStatus === MODERATION_STATUSES_ENUM.REJECTED ||
         moderationEventStatus === MODERATION_STATUSES_ENUM.APPROVED;
-    let claimButtonTooltipText = '';
-
-    switch (moderationEventStatus) {
-        case MODERATION_STATUSES_ENUM.PENDING:
-            claimButtonTooltipText =
-                'A production location must be created before it can receive a claim request.';
-            break;
-        case MODERATION_STATUSES_ENUM.APPROVED:
-            claimButtonTooltipText =
-                "Production location hasn't received a claim yet.";
-            break;
-        case MODERATION_STATUSES_ENUM.REJECTED:
-            claimButtonTooltipText =
-                'Moderation event has been rejected, no claim request available.';
-            break;
-        default:
-            break;
-    }
 
     return (
         <>
@@ -433,11 +415,7 @@ const DashboardContributionRecord = ({
                             {claimButtonTitle}
                         </Button>
                     ) : (
-                        <DialogTooltip
-                            text={claimButtonTooltipText}
-                            aria-label="Claim button tooltip"
-                            childComponent={claimButtonDisabled(classes)}
-                        />
+                        claimButtonDisabled(classes)
                     )}
                 </Grid>
             </Grid>