Remove Ferdi Server from available Servers List (#274)

4 files changed, 5 insertions, 51 deletions

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 61e0aed68..8d0960843 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -9,7 +9,7 @@ import Button from '../ui/button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
-import { LIVE_FERDIUM_API, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config';
+import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config';
 import globalMessages from '../../i18n/globalMessages';
 import { H1 } from '../ui/headline';
 
@@ -44,11 +44,9 @@ class ChangeServer extends Component {
 
   ferdiumServer = LIVE_FERDIUM_API;
 
-  ferdiServer = LIVE_FERDI_API;
-
   franzServer = LIVE_FRANZ_API;
 
-  defaultServers = [this.ferdiumServer, this.franzServer, this.ferdiServer];
+  defaultServers = [ this.ferdiumServer, this.franzServer ];
 
   form = (() => {
     const { intl } = this.props;
@@ -60,7 +58,6 @@ class ChangeServer extends Component {
           options: [
             { value: this.ferdiumServer, label: 'Ferdium (Default)' },
             { value: this.franzServer, label: 'Franz' },
-            { value: this.ferdiServer, label: 'Ferdi' },
             {
               value: this.defaultServers.includes(this.props.server)
                 ? ''
@@ -114,7 +111,7 @@ class ChangeServer extends Component {
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
           <H1>{intl.formatMessage(messages.headline)}</H1>
-          {(form.$('server').value === this.franzServer || form.$('server').value === this.ferdiServer) && (
+          {(form.$('server').value === this.franzServer) && (
             <Infobox type="warning">
               {intl.formatMessage(messages.warning)}
             </Infobox>
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index c6b26a21d..74b9fef47 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config';
+import { LIVE_FRANZ_API } from '../../config';
 import { API_VERSION } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
@@ -155,24 +155,6 @@ class Login extends Component {
                   </Link>
                 </p>
               )}
-              {window['ferdium'].stores.settings.all.app.server !==
-                LIVE_FERDI_API && (
-                <p className="error-message center">
-                  {intl.formatMessage(messages.customServerQuestion)}{' '}
-                  <Link
-                    to={`${window[
-                      'ferdium'
-                    ].stores.settings.all.app.server.replace(
-                      API_VERSION,
-                      '',
-                    )}/import`}
-                    target="_blank"
-                    style={{ cursor: 'pointer', textDecoration: 'underline' }}
-                  >
-                    {intl.formatMessage(messages.customServerSuggestion)}
-                  </Link>
-                </p>
-              )}
             </>
           )}
           {isSubmitting ? (
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 32e82940d..8ebf1ac5f 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -8,7 +8,7 @@ import { H1, H2 } from '../../ui/headline';
 import Loader from '../../ui/Loader';
 import Button from '../../ui/button';
 import Infobox from '../../ui/Infobox';
-import { LOCAL_SERVER, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../../config';
+import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -95,7 +95,6 @@ class AccountDashboard extends Component {
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
-    const isUsingFerdiServer = server === LIVE_FERDI_API;
 
     return (
       <div className="settings__main">
@@ -211,29 +210,6 @@ class AccountDashboard extends Component {
                       </div>
                     </div>
                   )}
-                  {isUsingFerdiServer && (
-                    <div className="account franz-form">
-                      <div className="account__box">
-                        <H2>
-                          {intl.formatMessage(messages.headlineDangerZone)}
-                        </H2>
-                        {!isDeleteAccountSuccessful && (
-                          <div className="account__subscription">
-                            <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                            <Button
-                              label={intl.formatMessage(messages.deleteAccount)}
-                              buttonType="danger"
-                              onClick={() => deleteAccount()}
-                              loaded={!isLoadingDeleteAccount}
-                            />
-                          </div>
-                        )}
-                        {isDeleteAccountSuccessful && (
-                          <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                        )}
-                      </div>
-                    </div>
-                  )}
                 </>
               )}
             </>
diff --git a/src/config.ts b/src/config.ts
index 1b9aedfce..2df09e03d 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -13,7 +13,6 @@ export const DEV_FRANZ_API = 'https://dev.franzinfra.com';
 
 export const LIVE_FERDIUM_API = 'https://api.ferdium.org';
 export const LIVE_FRANZ_API = 'https://api.franzinfra.com';
-export const LIVE_FERDI_API = 'https://api.getferdi.com';
 
 // URL used to submit debugger information, see https://github.com/ferdium/debugger
 export const DEBUG_API = 'https://debug.ferdium.org';