Merge remote-tracking branch 'upstream/master' into clearnet

ts/components/conversation/message/MessageContent.tsx

@@ -190,13 +190,14 @@ export const MessageContent = (props: Props) => {
             </>
           )}
           {hasContentAfterAttachmentAndQuote ? (
-            <Flex padding="7px" container={true} flexDirection="column">
+            <>
               {!isDeleted && (
                 <MessagePreview messageId={props.messageId} handleImageError={handleImageError} />
               )}
-
+              <Flex padding="7px" container={true} flexDirection="column">
-              <MessageText messageId={props.messageId} />
+                <MessageText messageId={props.messageId} />
-            </Flex>
+              </Flex>
+            </>
           ) : null}
         </IsMessageVisibleContext.Provider>
       </InView>

ts/session/snode_api/SNodeAPI.ts

@@ -417,7 +417,6 @@ export async function storeOnNode(
   try {
     // no retry here. If an issue is with the path this is handled in lokiOnionFetch
     // if there is an issue with the targetNode, we still send a few times this request to a few snodes in // already so it's handled
-
     const result = await snodeRpc({
       method: 'store',
       params,