From e586dc5bb83ae212af6db20c9cd3a591cbcaa895 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Wed, 23 May 2018 12:03:04 +0200
Subject: [PATCH] fix(pay-form): ensure payment form shows on top

This fixes an issue where the payment form - initiated from an external
request payment link - would display under the connect dialog if that was
already open. This change ensures that the payment form always displays
on the top most layer.

Fix #284
---
 app/components/Form/Form.scss    | 4 ++--
 app/routes/app/components/App.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/components/Form/Form.scss b/app/components/Form/Form.scss
index f30d07f9..d4d00675 100644
--- a/app/components/Form/Form.scss
+++ b/app/components/Form/Form.scss
@@ -3,7 +3,7 @@
 .container {
   position: absolute;
   top: 0;
-  z-index: 10;
+  z-index: 20;
   height: 100vh;
   width: 100%;
   background: $spaceblue;
@@ -26,4 +26,4 @@
   svg {
     color: $white;
   }
-}
\ No newline at end of file
+}
diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index 7936c287..db7ee37c 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -85,7 +85,6 @@ class App extends Component {
 
         <ContactModal {...contactModalProps} />
 
-        <Form formType={form.formType} formProps={formProps} closeForm={closeForm} />
         <ChannelForm {...channelFormProps} />
 
         <ReceiveModal {...receiveModalProps} />
@@ -101,6 +100,8 @@ class App extends Component {
             :
             <Network {...networkTabProps} />
         }
+
+        <Form formType={form.formType} formProps={formProps} closeForm={closeForm} />
       </div>
     )
   }