Merge branch 'hotfix/v2.5.1' into bugfix/campaigns-banner

packages/client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js

@@ -714,6 +714,7 @@ class Tile extends React.PureComponent {
         isThirdParty: true,
         icon: item.thirdPartyIcon,
         label: item.providerKey,
+        providerType: item.providerType,
         onClick: () =>
           selectOption({
             option: "typeProvider",

packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js

@@ -190,6 +190,10 @@ const VersionRow = (props) => {
   //   );
   // };
 
+  const onContextMenu = (event) => {
+    if (showEditPanel) event.stopPropagation();
+  };
+
   const contextOptions = [
     {
       key: "open",
@@ -241,7 +245,7 @@ const VersionRow = (props) => {
       isEditing={isEditing}
       contextTitle={t("Common:Actions")}
     >
-      <div className={`version-row_${index}`}>
+      <div className={`version-row_${index}`} onContextMenu={onContextMenu}>
         <Box displayProp="flex" className="row-header">
           <VersionBadge
             theme={theme}