Merge branch 'unstable' into feat/ses-825/onboarding2

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",

ts/components/leftpane/conversation-list-item/MessageItem.tsx

@@ -74,13 +74,21 @@ function IconMessageStatus({ status }: { status: LastMessageStatusType }) {
   const nonErrorIconColor = 'var(--text-secondary-color';
   switch (status) {
     case 'error':
-      return <SessionIcon iconColor={'var(--danger-color'} iconType="error" iconSize="tiny" />;
+      return (
+        <SessionIcon
+          iconColor={'var(--danger-color'}
+          iconType="error"
+          iconSize="tiny"
+          style={{ flexShrink: 0 }}
+        />
+      );
     case 'read':
       return (
         <SessionIcon
           iconColor={nonErrorIconColor}
           iconType="doubleCheckCircleFilled"
           iconSize="tiny"
+          style={{ flexShrink: 0 }}
         />
       );
     case 'sending':
@@ -90,10 +98,18 @@ function IconMessageStatus({ status }: { status: LastMessageStatusType }) {
           iconColor={nonErrorIconColor}
           iconType="sending"
           iconSize="tiny"
+          style={{ flexShrink: 0 }}
         />
       );
     case 'sent':
-      return <SessionIcon iconColor={nonErrorIconColor} iconType="circleCheck" iconSize="tiny" />;
+      return (
+        <SessionIcon
+          iconColor={nonErrorIconColor}
+          iconType="circleCheck"
+          iconSize="tiny"
+          style={{ flexShrink: 0 }}
+        />
+      );
     case undefined:
       return null;
     default: