2 files changed, 5 insertions, 5 deletions

diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index 53df69eed..a7fe24bb1 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,7 +1,7 @@
 import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 import apiBase from '../../api/apiBase';
-import { GITHUB_FERDI_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
+import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
@@ -12,8 +12,8 @@ export const announcementsApi = {
   },
 
   async getChangelog(version) {
-    // TODO: This doesn't seem to handle the different 'nightlies' repo that we currently use. Needs to be fixed.
-    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${GITHUB_FERDI_REPO_NAME}/releases/tags/v${version}`;
+    const ferdiRepoName = version.includes('nightly') ? GITHUB_NIGHTLIES_REPO_NAME : GITHUB_FERDI_REPO_NAME;
+    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${ferdiRepoName}/releases/tags/v${version}`;
     debug(`fetching release changelog from Github url: ${url}`);
     const request = await window.fetch(url, { method: 'GET' });
     if (!request.ok) return null;
@@ -22,7 +22,7 @@ export const announcementsApi = {
   },
 
   async getAnnouncement(version) {
-    const url = `${apiBase(true)}/announcements/${version}`;
+    const url = `${apiBase()}/announcements/${version}`;
     debug(`fetching release announcement from api url: ${url}`);
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 21964b108..315843db3 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -25,7 +25,7 @@ const messages = defineMessages({
 
 const smallScreen = '1000px';
 
-const styles = theme => ({
+const styles = (theme) => ({
   container: {
     background: theme.colorBackground,
     position: 'relative',