From 1b09eaab1e2a02912fca8c439a7a9a56d7a00d0d Mon Sep 17 00:00:00 2001 From: Boris Date: Tue, 11 Jun 2024 10:40:46 +0200 Subject: [PATCH 1/2] Fix: Annoucement banner only for mac app Changelog: fixed --- .../appstore_announcement_bar/appstore_announcement_bar.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx index e8055a8e4c..bc69e78030 100644 --- a/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx +++ b/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx @@ -23,6 +23,9 @@ export default class AppStoreBar extends React.PureComponent { const latestVer = latestVersion || ''; const userAgentVersion = UserAgent.getDesktopVersion(); + if (userAgentVersion.indexOf('Mac') === -1) { + return null; + } if (!latestVer || !userAgentVersion) { return null; } From 0dd21b9762833e41bf49fb250daa7641d13c9fbe Mon Sep 17 00:00:00 2001 From: Boris Date: Tue, 11 Jun 2024 11:53:38 +0200 Subject: [PATCH 2/2] Fix: condition with userAgent Changelog: fixed --- .../appstore_announcement_bar.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx index bc69e78030..a2f46761a7 100644 --- a/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx +++ b/webapp/channels/src/components/announcement_bar/appstore_announcement_bar/appstore_announcement_bar.tsx @@ -23,9 +23,14 @@ export default class AppStoreBar extends React.PureComponent { const latestVer = latestVersion || ''; const userAgentVersion = UserAgent.getDesktopVersion(); - if (userAgentVersion.indexOf('Mac') === -1) { + if (!UserAgent.isMacApp()) { return null; } + + if (UserAgent.isNotMacMas()) { + return null; + } + if (!latestVer || !userAgentVersion) { return null; }