From f59b9c31b1948481d8909d4319a5fd34f32651cd Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Tue, 2 Oct 2018 10:21:22 +0200
Subject: [PATCH] trezor-connect iframe loading error

---
 .../components/InitializationError/index.js   | 23 +++++++++++++++++++
 src/views/Landing/index.js                    | 10 ++++----
 .../Wallet/views/UnreadableDevice/index.js    |  8 +------
 3 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 src/views/Landing/components/InitializationError/index.js

diff --git a/src/views/Landing/components/InitializationError/index.js b/src/views/Landing/components/InitializationError/index.js
new file mode 100644
index 00000000..2db65aee
--- /dev/null
+++ b/src/views/Landing/components/InitializationError/index.js
@@ -0,0 +1,23 @@
+/* @flow */
+
+import React from 'react';
+import styled from 'styled-components';
+import { Notification } from 'components/Notification';
+
+const Wrapper = styled.div`
+    min-width: 720px;
+    width: 100%;
+`;
+
+const InitializationError = (props: { error: ?string }) => (
+    <Wrapper>
+        <Notification
+            title="Initialization error"
+            message={props.error || ''}
+            type="error"
+            cancelable={false}
+        />
+    </Wrapper>
+);
+
+export default InitializationError;
\ No newline at end of file
diff --git a/src/views/Landing/index.js b/src/views/Landing/index.js
index 398b9ef4..13ec9331 100644
--- a/src/views/Landing/index.js
+++ b/src/views/Landing/index.js
@@ -14,6 +14,7 @@ import { H2 } from 'components/Heading';
 import { isWebUSB } from 'utils/device';
 import { FONT_SIZE } from 'config/variables';
 
+import InitializationError from './components/InitializationError';
 import BrowserNotSupported from './components/BrowserNotSupported';
 import ConnectDevice from './components/ConnectDevice';
 import InstallBridge from './components/InstallBridge';
@@ -77,13 +78,13 @@ export default (props: Props) => {
     const bridgeRoute: boolean = props.router.location.state.hasOwnProperty('bridge');
     const deviceLabel = props.wallet.disconnectRequest ? props.wallet.disconnectRequest.label : '';
 
-    const shouldShowInstallBridge = connectError || bridgeRoute;
+    const shouldShowInitializationError = connectError && !props.connect.initialized;
+    const shouldShowInstallBridge = props.connect.initialized && (connectError || bridgeRoute);
     const shouldShowConnectDevice = props.wallet.ready && devices.length < 1;
     const shouldShowDisconnectDevice = !!props.wallet.disconnectRequest;
     const shouldShowUnsupportedBrowser = browserState.supported === false;
 
-    const isLoading = !shouldShowInstallBridge && !shouldShowConnectDevice && !shouldShowUnsupportedBrowser && !localStorageError;
-
+    const isLoading = !shouldShowInitializationError && !shouldShowInstallBridge && !shouldShowConnectDevice && !shouldShowUnsupportedBrowser && !localStorageError;
     return (
         <LandingWrapper>
             {isLoading && <LandingLoader text="Loading" size={100} />}
@@ -98,10 +99,9 @@ export default (props: Props) => {
                         />
                     )}
                     <Notifications />
+                    {shouldShowInitializationError && <InitializationError error={connectError} />}
                     <Log />
-
                     <LandingContent>
-
                         {shouldShowUnsupportedBrowser && <BrowserNotSupported />}
                         {shouldShowInstallBridge && <InstallBridge browserState={browserState} />}
 
diff --git a/src/views/Wallet/views/UnreadableDevice/index.js b/src/views/Wallet/views/UnreadableDevice/index.js
index f0bf3dff..15e99283 100644
--- a/src/views/Wallet/views/UnreadableDevice/index.js
+++ b/src/views/Wallet/views/UnreadableDevice/index.js
@@ -1,14 +1,8 @@
 /* @flow */
 
-
 import React from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { Notification } from 'components/Notification';
-import * as TrezorConnectActions from 'actions/TrezorConnectActions';
-
-import type { State, Dispatch } from 'flowtype';
 
 const Wrapper = styled.div``;
 
@@ -23,4 +17,4 @@ const UnreadableDevice = () => (
     </Wrapper>
 );
 
-export default connect(null, null)(UnreadableDevice);
+export default UnreadableDevice;