From 84fd12ca62846dd63b4d310c132d34c6d659cb98 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 7 Apr 2022 13:26:35 +1000
Subject: [PATCH 1/2] fix github action build

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d5b7c05cf..f025e9898 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "abort-controller": "3.0.0",
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
-    "better-sqlite3": "https://github.com/signalapp/better-sqlite3#ad0db5dd09c0ea4007b1c46bd4f7273827803347",
+    "better-sqlite3": "https://github.com/signalapp/better-sqlite3#9de3488f68d7429133dd859b7308fdcbd64f02f6",
     "blob-util": "2.0.2",
     "blueimp-canvas-to-blob": "^3.29.0",
     "blueimp-load-image": "5.14.0",
diff --git a/yarn.lock b/yarn.lock
index 897a05294..e5c9adc92 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1649,9 +1649,9 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-"better-sqlite3@https://github.com/signalapp/better-sqlite3#ad0db5dd09c0ea4007b1c46bd4f7273827803347":
+"better-sqlite3@https://github.com/signalapp/better-sqlite3#9de3488f68d7429133dd859b7308fdcbd64f02f6":
   version "7.1.4"
-  resolved "https://github.com/signalapp/better-sqlite3#ad0db5dd09c0ea4007b1c46bd4f7273827803347"
+  resolved "https://github.com/signalapp/better-sqlite3#9de3488f68d7429133dd859b7308fdcbd64f02f6"
   dependencies:
     bindings "^1.5.0"
     tar "^6.1.0"

From 02612280c37be71b995e501f0491cc87863ec9b6 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 7 Apr 2022 13:45:05 +1000
Subject: [PATCH 2/2] fix multi select including audio messages

---
 ts/components/conversation/H5AudioPlayer.tsx                  | 3 +++
 .../message/message-content/MessageAttachment.tsx             | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx
index f9aa62505..ce3658ad0 100644
--- a/ts/components/conversation/H5AudioPlayer.tsx
+++ b/ts/components/conversation/H5AudioPlayer.tsx
@@ -7,6 +7,7 @@ import { setNextMessageToPlayId } from '../../state/ducks/conversations';
 import {
   getNextMessageToPlayId,
   getSortedMessagesOfSelectedConversation,
+  isMessageSelectionMode,
 } from '../../state/selectors/conversations';
 import { getAudioAutoplay } from '../../state/selectors/userConfig';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
@@ -25,6 +26,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
   const autoPlaySetting = useSelector(getAudioAutoplay);
   const messageProps = useSelector(getSortedMessagesOfSelectedConversation);
   const nextMessageToPlayId = useSelector(getNextMessageToPlayId);
+  const multiSelectMode = useSelector(isMessageSelectionMode);
 
   useEffect(() => {
     // updates playback speed to value selected in context menu
@@ -82,6 +84,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
     <H5AudioPlayer
       src={urlToLoad}
       preload="metadata"
+      style={{ pointerEvents: multiSelectMode ? 'none' : 'inherit' }}
       layout="horizontal-reverse"
       showSkipControls={false}
       showJumpControls={false}
diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx
index 3cae90259..33cd32dd5 100644
--- a/ts/components/conversation/message/message-content/MessageAttachment.tsx
+++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx
@@ -134,7 +134,11 @@ export const MessageAttachment = (props: Props) => {
       <div
         role="main"
         onClick={(e: any) => {
+          if (multiSelectMode) {
+            dispatch(toggleSelectedMessageId(messageId));
+          }
           e.stopPropagation();
+          e.preventDefault();
         }}
         style={{ padding: '5px 10px' }}
       >