3 files changed, 4 insertions, 11 deletions

diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index a581bd8de..eadb7dfce 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,6 +1,6 @@
 import { remote } from 'electron';
 import Request from '../../stores/lib/Request';
-import { API, API_VERSION } from '../../environment';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Franz:feature:announcements:api');
 
@@ -21,7 +21,7 @@ export const announcementsApi = {
 
   async getAnnouncement(version) {
     debug('fetching release announcement from api');
-    const url = `${API}/${API_VERSION}/announcements/${version}`;
+    const url = `${apiBase()}/announcements/${version}`;
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
     return response.json();
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 03bd5ba41..38de2dbc8 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -8,7 +8,6 @@ import { Button } from '@meetfranz/forms';
 
 import { announcementsStore } from '../index';
 import UIStore from '../../../stores/UIStore';
-import { gaEvent } from '../../../lib/analytics';
 
 const renderer = new marked.Renderer();
 
@@ -19,7 +18,7 @@ const markedOptions = { sanitize: true, renderer };
 const messages = defineMessages({
   headline: {
     id: 'feature.announcements.changelog.headline',
-    defaultMessage: '!!!Changes in Franz {version}',
+    defaultMessage: '!!!Changes in Ferdi {version}',
   },
 });
 
@@ -228,9 +227,7 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.main.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.main.cta;
                         window.location.href = `#${announcement.main.cta.href}`;
-                        gaEvent(analytics.category, analytics.action, announcement.main.cta.label);
                       }}
                     />
                   </div>
@@ -253,9 +250,7 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.spotlight.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.spotlight.cta;
                         window.location.href = `#${announcement.spotlight.cta.href}`;
-                        gaEvent(analytics.category, analytics.action, announcement.spotlight.cta.label);
                       }}
                     />
                   </div>
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index d58afbc8e..91348029f 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -7,12 +7,11 @@ import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
-import { gaEvent } from '../../lib/analytics';
 import { matchRoute } from '../../helpers/routing-helpers';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 
@@ -114,7 +113,6 @@ export class AnnouncementsStore extends FeatureStore {
     if (router.location.pathname !== targetRoute) {
       this.stores.router.push(targetRoute);
     }
-    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
   // ======= REACTIONS ========