From f28399634079ccdcb51d33cb9e3a8a5d75cc6923 Mon Sep 17 00:00:00 2001
From: vantezzen <properly@protonmail.com>
Date: Wed, 28 Aug 2019 12:10:34 +0200
Subject: Add suggestion to import Franz account

---
 src/components/auth/Login.js | 13 ++++++++++++-
 src/components/ui/Link.js    |  4 ++++
 src/index.js                 |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index ef6176110..8777b00f8 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -137,7 +137,18 @@ export default @observer class Login extends Component {
             showPasswordToggle
           />
           {error.code === 'invalid-credentials' && (
-            <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
+            <>
+              <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
+              { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && (
+                <p className="error-message center">
+                    Using a custom Ferdi server? Try{' '}
+                    <Link 
+                      to={ window.ferdi.stores.settings.all.app.server.replace('v1', '') + '/import' } 
+                      target="_blank"
+                      style={{ cursor: 'pointer', textDecoration: 'underline' }}>importing your Franz account</Link>
+                </p>
+              )}
+            </>
           )}
           {isSubmitting ? (
             <Button
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index b88686d5e..5c5ef9d7d 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -25,6 +25,7 @@ export default @inject('stores') @observer class Link extends Component {
       className,
       activeClassName,
       strictFilter,
+      style,
     } = this.props;
     const { router } = stores;
 
@@ -44,6 +45,7 @@ export default @inject('stores') @observer class Link extends Component {
       <a
         href={router.history.createHref(to)}
         className={linkClasses}
+        style={style}
         onClick={e => this.onClick(e)}
       >
         {children}
@@ -65,6 +67,7 @@ Link.wrappedComponent.propTypes = {
   activeClassName: PropTypes.string,
   strictFilter: PropTypes.bool,
   target: PropTypes.string,
+  style: PropTypes.object,
 };
 
 Link.wrappedComponent.defaultProps = {
@@ -72,4 +75,5 @@ Link.wrappedComponent.defaultProps = {
   activeClassName: '',
   strictFilter: false,
   target: '',
+  style: {}
 };
diff --git a/src/index.js b/src/index.js
index fbb8e1049..e1b4a7cd2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -177,7 +177,7 @@ const createWindow = () => {
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
+    backgroundColor: !settings.get('darkMode') ? '#7367F0' : '#1E1E1E',
     webPreferences: {
       nodeIntegration: true,
       webviewTag: true,
-- 
cgit v1.2.3-70-g09d2