Merge branch 'hotfix/v2.6.1' into develop

# Conflicts:
#	packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js

packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js

@@ -385,7 +385,6 @@ StyledCrossIcon.defaultProps = { theme: Base };
 
 const StyledDeleteIcon = styled(DeleteIcon)`
   cursor: pointer;
-  margin-inline-start: auto;
 
   ${iconStyles}
 `;
@@ -484,6 +483,14 @@ const StyledInviteLanguage = styled.div`
 `;
 
 StyledCrossIcon.defaultProps = { theme: Base };
+
+const ErrorWrapper = styled.div`
+  display: flex;
+  flex-wrap: nowrap;
+  gap: 12px;
+  margin-inline-start: auto;
+`;
+
 export {
   StyledInvitePanel,
   StyledRow,
@@ -508,4 +515,5 @@ export {
   StyledInviteLanguage,
   StyledInviteUserBody,
   StyledExternalLink,
+  ErrorWrapper,
 };

packages/client/src/components/panels/InvitePanel/sub-components/Item.js

@@ -49,6 +49,7 @@ import {
   StyledHelpButton,
   StyledDeleteIcon,
   StyledInviteUserBody,
+  ErrorWrapper,
 } from "../StyledInvitePanel";
 import { filterGroupRoleOptions, filterUserRoleOptions } from "SRC_DIR/helpers";
 import AccessSelector from "../../../AccessSelector";
@@ -228,7 +229,7 @@ const Item = ({
       </StyledInviteUserBody>
 
       {hasError ? (
-        <>
+        <ErrorWrapper>
           <StyledHelpButton
             iconName={InfoEditReactSvgUrl}
             displayType="auto"
@@ -243,7 +244,7 @@ const Item = ({
             size="medium"
             onClick={removeItem}
           />
-        </>
+        </ErrorWrapper>
       ) : (
         <>
           {warning && (