From 10561e4e3c0e3e67de8c91e76b53790dc2fa6346 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Wed, 2 Aug 2023 11:56:11 +1000
Subject: [PATCH] Merge branch 'unstable' into userconfig_disappearingmessage

---
 README.md                                           |  4 +++-
 .../conversation/composition/CompositionBox.tsx     | 13 +++----------
 ts/session/utils/Toast.tsx                          |  4 ----
 ts/test/automation/setup/beforeEach.ts              |  4 ++--
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a37e03d5f..3e2dd66d3 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
 # Session Desktop
 
+[Download at getsession.org](https://getsession.org/download)
+
 ## Summary
 
 Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages offline, and a set of nodes which allow for onion routing functionality obfuscating users IP Addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).
 <br/><br/>
-![DesktopSession](https://i.imgur.com/ZnHvYjo.jpg)
+![DesktopSession](https://i.imgur.com/ydVhH00.png)
 
 ## Want to Contribute? Found a Bug or Have a feature request?
 
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 31d6d8279..96c5ab621 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -470,16 +470,13 @@ class CompositionBoxInner extends React.Component<Props, State> {
       if (left) {
         return i18n('youLeftTheGroup');
       }
-      if (isBlocked && isPrivate) {
+      if (isBlocked) {
         return i18n('unblockToSend');
       }
-      if (isBlocked && !isPrivate) {
-        return i18n('unblockGroupToSend');
-      }
       return i18n('sendMessage');
     };
 
-    const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation;
+    const { isKickedFromGroup, left, isBlocked } = this.props.selectedConversation;
     const messagePlaceHolder = makeMessagePlaceHolderText();
     const { typingEnabled } = this.props;
     const neverMatchingRegex = /($a)/;
@@ -856,14 +853,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
       return;
     }
 
-    if (selectedConversation.isBlocked && selectedConversation.isPrivate) {
+    if (selectedConversation.isBlocked) {
       ToastUtils.pushUnblockToSend();
       return;
     }
-    if (selectedConversation.isBlocked && !selectedConversation.isPrivate) {
-      ToastUtils.pushUnblockToSendGroup();
-      return;
-    }
     // Verify message length
     const msgLen = messagePlaintext?.length || 0;
     if (msgLen === 0 && this.props.stagedAttachments?.length === 0) {
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index 0de25cbaa..1087345ed 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -201,10 +201,6 @@ export function pushUnblockToSend() {
   pushToastInfo('unblockToSend', window.i18n('unblockToSend'));
 }
 
-export function pushUnblockToSendGroup() {
-  pushToastInfo('unblockGroupToSend', window.i18n('unblockGroupToSend'));
-}
-
 export function pushYouLeftTheGroup() {
   pushToastError('youLeftTheGroup', window.i18n('youLeftTheGroup'));
 }
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index f47f97418..016cf072d 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -25,9 +25,9 @@ function cleanUpOtherTest() {
   alreadyCleanedWaiting = true;
 
   const parentFolderOfAllDataPath = isMacOS()
-    ? '~/Library/Application Support/'
+    ? join(homedir(), 'Library', 'Application Support')
     : isLinux()
-    ? `${homedir()}/.config/`
+    ? join(homedir(), '.config')
     : null;
   if (!parentFolderOfAllDataPath) {
     throw new Error('Only macOS is currrently supported ');