Removed hardcoded strings and reused constants defined in config.js (#1499)

4 files changed, 10 insertions, 8 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 809bfda6e..68d88e218 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -11,7 +11,7 @@ import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
-import { LOCAL_SERVER } from '../../../config';
+import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -154,7 +154,7 @@ class AccountDashboard extends Component {
     }
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
-    const isUsingFranzServer = server === 'https://api.franzinfra.com';
+    const isUsingFranzServer = server === LIVE_FRANZ_API;
 
     return (
       <div className="settings__main">
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index f7786f4e8..616c8c587 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react';
 import { ProBadge } from '@meetfranz/ui';
 import { RouterStore } from 'mobx-react-router';
 
-import { LOCAL_SERVER, LIVE_API } from '../../../config';
+import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
 import Link from '../../ui/Link';
 import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
@@ -82,7 +82,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
         this.props.actions.settings.update({
           type: 'app',
           data: {
-            server: LIVE_API,
+            server: LIVE_FERDI_API,
           },
         });
       }
@@ -105,7 +105,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     const { intl } = this.context;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
-    const isUsingFranzServer = stores.settings.app.server === 'https://api.franzinfra.com';
+    const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
 
     return (
       <div className="settings-navigation">
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 0c0366335..08e5efa2a 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -16,6 +16,7 @@ import Input from '../../ui/Input';
 import {
   DEFAULT_APP_SETTINGS,
   FRANZ_TRANSLATION,
+  GITHUB_FRANZ_URL,
 } from '../../../config';
 import { isMac, isWindows } from '../../../environment';
 
@@ -677,13 +678,13 @@ export default @observer class EditSettingsForm extends Component {
 
                   Ferdi is based on
                   {' '}
-                  <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank">Franz</a>
 
 
                   , a project published
                   under the
                   {' '}
-                  <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank">Apache-2.0 License</a>
                 </span>
                 <br />
                 <span className="mdi mdi-information" />
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 72358d485..f26f4cc0c 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -12,6 +12,7 @@ import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import globalMessages from '../../../i18n/globalMessages';
 import UpgradeButton from '../../ui/UpgradeButton';
+import { LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -125,7 +126,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     } = this.props;
     const { intl } = this.context;
 
-    if (server === 'https://api.franzinfra.com') {
+    if (server === LIVE_FRANZ_API) {
       return (
         <div className="settings__main">
           <div className="settings__header">