Skip to content

Commit 5f4320c

Browse files
committed
Merge branch 'dev' into staging
2 parents 76db5bd + 3dd49f0 commit 5f4320c

3 files changed

Lines changed: 180 additions & 164 deletions

File tree

‎electron/src/menu/TrayHandler.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,16 @@ export class TrayHandler {
100100
if (win.isFocused() || !count) {
101101
win.flashFrame(false);
102102
} else if (count > this.lastUnreadCount) {
103-
win.flashFrame(true);
103+
/* After an Electron API change https://github.com/electron/electron/pull/41391
104+
flashFrame() leads to a constant bouncing of the dock icon on macOS.
105+
By calling the dock.bounce() directly, we avoid this behavior. the "informational"
106+
is optional (default), but makes it easier to read
107+
*/
108+
if (process.platform === 'darwin') {
109+
app.dock.bounce('informational');
110+
} else {
111+
win.flashFrame(true);
112+
}
104113
}
105114
}
106115

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dependencies": {
44
"@electron/remote": "2.1.2",
55
"@hapi/joi": "17.1.1",
6-
"@wireapp/certificate-check": "0.7.18",
6+
"@wireapp/certificate-check": "0.7.19",
77
"@wireapp/commons": "5.4.0",
88
"@wireapp/protocol-messaging": "1.51.0",
99
"@wireapp/react-ui-kit": "9.28.0",
@@ -38,12 +38,12 @@
3838
"@babel/plugin-proposal-class-properties": "7.18.6",
3939
"@babel/plugin-proposal-optional-chaining": "7.21.0",
4040
"@babel/preset-env": "7.26.0",
41-
"@babel/preset-react": "7.25.9",
41+
"@babel/preset-react": "7.26.3",
4242
"@babel/preset-typescript": "7.26.0",
4343
"@babel/register": "7.25.9",
4444
"@electron/fuses": "1.8.0",
4545
"@electron/osx-sign": "1.3.1",
46-
"@types/adm-zip": "0.5.6",
46+
"@types/adm-zip": "0.5.7",
4747
"@types/amplify": "1.1.28",
4848
"@types/auto-launch": "5.0.5",
4949
"@types/content-type": "1.1.8",
@@ -55,11 +55,11 @@
5555
"@types/lodash": "4.17.13",
5656
"@types/minimist": "1.2.5",
5757
"@types/mocha": "10.0.10",
58-
"@types/node": "18.19.66",
58+
"@types/node": "18.19.67",
5959
"@types/open-graph": "0.2.5",
6060
"@types/platform": "1.3.6",
6161
"@types/prettier": "^2.7.3",
62-
"@types/react": "^18.3.12",
62+
"@types/react": "^18.3.13",
6363
"@types/react-dom": "^18.3.1",
6464
"@types/redux-logger": "^3.0.12",
6565
"@types/sinon": "17.0.3",
@@ -81,16 +81,16 @@
8181
"core-js": "3.39.0",
8282
"cross-env": "7.0.3",
8383
"css-loader": "7.1.2",
84-
"dotenv": "16.4.5",
85-
"electron": "33.2.0",
84+
"dotenv": "16.4.7",
85+
"electron": "33.2.1",
8686
"electron-builder": "24.13.3",
8787
"electron-mocha": "12.3.1",
8888
"electron-packager": "17.1.2",
8989
"electron-winstaller": "4.0.1",
9090
"eslint": "8.57.0",
9191
"eslint-config-prettier": "9.1.0",
9292
"eslint-import-resolver-alias": "^1.1.2",
93-
"eslint-import-resolver-typescript": "^3.6.3",
93+
"eslint-import-resolver-typescript": "^3.7.0",
9494
"eslint-plugin-better-styled-components": "1.1.2",
9595
"eslint-plugin-header": "3.1.1",
9696
"eslint-plugin-import": "^2.31.0",
@@ -122,7 +122,7 @@
122122
"style-loader": "4.0.0",
123123
"ts-node": "10.9.2",
124124
"typescript": "5.7.2",
125-
"webpack": "5.96.1",
125+
"webpack": "5.97.0",
126126
"webpack-cli": "5.1.4"
127127
},
128128
"homepage": "https://wire.com",

0 commit comments

Comments
 (0)