From b955cf2bf0fd946617d480ca65b13ea6aa056e09 Mon Sep 17 00:00:00 2001
From: Juan Cortes Ross <juan@bohem.io>
Date: Fri, 21 Dec 2018 10:12:32 +0100
Subject: [PATCH] Changes to pr - Moved component to a different parent due to
 zindex - Made to show only the first element if any - Removed deprecated
 willBeMounted usage

---
 src/components/HSMStatusBanner.js | 38 ++++++++++++-------------------
 src/components/TopBar/index.js    |  1 -
 src/components/layout/Default.js  |  2 ++
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/components/HSMStatusBanner.js b/src/components/HSMStatusBanner.js
index 4be4800b..94606f72 100644
--- a/src/components/HSMStatusBanner.js
+++ b/src/components/HSMStatusBanner.js
@@ -14,6 +14,7 @@ import IconChevronRight from 'icons/ChevronRight'
 
 import Box from 'components/base/Box'
 import { SHOW_MOCK_HSMWARNINGS } from '../config/constants'
+import { urls } from '../config/urls'
 
 const CloseIconContainer = styled.div`
   position: absolute;
@@ -38,7 +39,6 @@ type Props = {
 
 type State = {
   pendingMessages: HSMStatus[],
-  dismissedMessages: string[],
 }
 
 type HSMStatus = {
@@ -48,26 +48,17 @@ type HSMStatus = {
 
 class HSMStatusBanner extends PureComponent<Props, State> {
   state = {
-    pendingMessages: [],
-    dismissedMessages: [],
-  }
-
-  componentWillMount() {
-    if (SHOW_MOCK_HSMWARNINGS) {
-      this.setState({
-        pendingMessages: [
+    pendingMessages: SHOW_MOCK_HSMWARNINGS
+      ? [
           {
             id: 'mock1',
             message: 'Lorem Ipsum dolor sit amet #1',
           },
-          {
-            id: 'mock2',
-            message: 'Lorem Ipsum dolor sit amet #2',
-          },
-        ],
-      })
-    }
+        ]
+      : [],
+  }
 
+  componentDidMount() {
     this.warningSub = warnings.subscribe({
       next: message => {
         this.setState(prevState => ({
@@ -85,21 +76,21 @@ class HSMStatusBanner extends PureComponent<Props, State> {
 
   warningSub = null
 
-  dismiss = item =>
+  dismiss = dismissedItem =>
     this.setState(prevState => ({
-      dismissedMessages: [...prevState.dismissedMessages, item.id],
+      pendingMessages: prevState.pendingMessages.filter(item => item.id !== dismissedItem.id),
     }))
 
   render() {
     const { t } = this.props
-    const { pendingMessages, dismissedMessages } = this.state
+    const { pendingMessages } = this.state
 
-    const filtered = pendingMessages.filter(item => dismissedMessages.indexOf(item.id) === -1)
+    if (!pendingMessages.length) return null
+    const item = pendingMessages[0]
 
-    if (!filtered.length) return null
     return (
       <Box flow={2} style={styles.container}>
-        {filtered.map(r => <BannerItem key={r.id} t={t} item={r} onItemDismiss={this.dismiss} />)}
+        <BannerItem key={item.id} t={t} item={item} onItemDismiss={this.dismiss} />
       </Box>
     )
   }
@@ -110,7 +101,7 @@ class BannerItem extends PureComponent<{
   onItemDismiss: HSMStatus => void,
   t: *,
 }> {
-  onLinkClick = () => openURL('#')
+  onLinkClick = () => openURL(urls.contactSupport)
   dismiss = () => this.props.onItemDismiss(this.props.item)
 
   render() {
@@ -158,6 +149,7 @@ const styles = {
     position: 'fixed',
     left: 32,
     bottom: 32,
+    zIndex: 100,
   },
   banner: {
     background: colors.orange,
diff --git a/src/components/TopBar/index.js b/src/components/TopBar/index.js
index 966df10b..7944d958 100644
--- a/src/components/TopBar/index.js
+++ b/src/components/TopBar/index.js
@@ -104,7 +104,6 @@ class TopBar extends PureComponent<Props> {
           <Box grow horizontal>
             <GlobalSearch t={t} isHidden />
             <CurrenciesStatusBanner />
-            <HSMStatusBanner />
             {hasAccounts && (
               <Fragment>
                 <ActivityIndicator />
diff --git a/src/components/layout/Default.js b/src/components/layout/Default.js
index f79744ac..02830da4 100644
--- a/src/components/layout/Default.js
+++ b/src/components/layout/Default.js
@@ -35,6 +35,7 @@ import SideBar from 'components/MainSideBar'
 import TopBar from 'components/TopBar'
 import SyncBackground from 'components/SyncBackground'
 import SyncContinuouslyPendingOperations from '../SyncContinouslyPendingOperations'
+import HSMStatusBanner from '../HSMStatusBanner'
 
 const Main = styled(GrowScroll).attrs({
   px: 6,
@@ -106,6 +107,7 @@ class Default extends Component<Props> {
               <SideBar />
 
               <Box shrink grow bg="lightGrey" color="grey" overflow="hidden" relative>
+                <HSMStatusBanner />
                 <TopBar />
                 <Main innerRef={n => (this._scrollContainer = n)} tabIndex={-1}>
                   <Route path="/" exact component={DashboardPage} />