Merge pull request #4 from session-foundation/chore/no-ref/merge_master

Merge master back into unstable

Author: Bilb

.github/workflows/build-binaries.yml

@@ -25,7 +25,7 @@ concurrency:
 
 env:
   # we want to publish on "push to master" only. When we don't want to publish, we want to upload artefacts
-  SHOULD_PUBLISH: ${{ github.event_name == 'push' && github.ref == 'master' }}
+  SHOULD_PUBLISH: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
 jobs:
   build_linux:
@@ -77,7 +77,7 @@ jobs:
         # we want this to run only when on "push" to "master"
         if: ${{ env.SHOULD_PUBLISH == 'true' }}
         run: |
-          sed -i 's/\"target\": \\[\"deb\"\\]/\"target\": \"${{ matrix.pkg_to_build }}\"/g' package.json; yarn build-release-publish
+          sed -i 's/"target": \["deb"\]/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release-publish
 
   build_windows:
     runs-on: windows-2022

package.json

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

ts/components/dialog/OpenUrlModal.tsx

@@ -61,7 +61,6 @@ export function OpenUrlModal(props: OpenUrlModalState) {
         />
         <SessionButton
           text={window.i18n('urlCopy')}
-          buttonColor={SessionButtonColor.White}
           buttonType={SessionButtonType.Simple}
           onClick={onClickCopy}
           dataTestId="session-confirm-cancel-button"

ts/components/leftpane/ActionsPanel.tsx

@@ -1,9 +1,11 @@
+import { ipcRenderer } from 'electron';
 import { debounce } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
 import useInterval from 'react-use/lib/useInterval';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
+import useThrottleFn from 'react-use/lib/useThrottleFn';
 
 import { Data } from '../../data/data';
 import { getConversationController } from '../../session/conversations';
@@ -37,18 +39,18 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
 import { SettingsKey } from '../../data/settings-key';
 import { useFetchLatestReleaseFromFileServer } from '../../hooks/useFetchLatestReleaseFromFileServer';
+import { useHotkey } from '../../hooks/useHotkey';
 import {
   forceRefreshRandomSnodePool,
   getFreshSwarmFor,
 } from '../../session/apis/snode_api/snodePool';
 import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { getIsModalVisble } from '../../state/selectors/modal';
 import { useIsDarkTheme } from '../../state/selectors/theme';
 import { switchThemeTo } from '../../themes/switchTheme';
 import { ReleasedFeatures } from '../../util/releaseFeature';
 import { getOppositeTheme } from '../../util/theme';
 import { SessionNotificationCount } from '../icon/SessionNotificationCount';
-import { useHotkey } from '../../hooks/useHotkey';
-import { getIsModalVisble } from '../../state/selectors/modal';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -238,6 +240,19 @@ export const ActionsPanel = () => {
     return () => clearTimeout(timeout);
   }, []);
 
+  const globalUnreadMessageCount = useSelector(getGlobalUnreadMessageCount);
+
+  // Reuse the unreadToShow from the global state to update the badge count
+  useThrottleFn(
+    (unreadCount: number) => {
+      if (globalUnreadMessageCount !== undefined) {
+        ipcRenderer.send('update-badge-count', unreadCount);
+      }
+    },
+    2000,
+    [globalUnreadMessageCount]
+  );
+
   useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null);
 
   useFetchLatestReleaseFromFileServer();

ts/mains/main_node.ts

@@ -10,6 +10,7 @@ import {
   dialog,
   protocol as electronProtocol,
   ipcMain as ipc,
+  ipcMain,
   IpcMainEvent,
   Menu,
   nativeTheme,
@@ -27,7 +28,7 @@ import { platform as osPlatform } from 'process';
 import url from 'url';
 
 import Logger from 'bunyan';
-import _, { isEmpty } from 'lodash';
+import _, { isEmpty, isNumber, isFinite } from 'lodash';
 import pify from 'pify';
 
 import { setupGlobalErrorHandler } from '../node/global_errors'; // checked - only node
@@ -1019,6 +1020,14 @@ ipc.on('get-start-in-tray', event => {
   }
 });
 
+ipcMain.on('update-badge-count', (_event, count) => {
+  if (app.isReady()) {
+    app.setBadgeCount(
+     isNumber(count) && isFinite(count) && count >= 0 ? count : 0 
+    );
+  }
+});
+
 ipc.on('get-opengroup-pruning', event => {
   try {
     const val = userConfig.get('opengroupPruning');