From c811fc5776c6deb2e66565fcc717ac4a3d51bdd0 Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Fri, 29 Apr 2022 09:29:40 +0100
Subject: [PATCH] Move notifications outside AppBody (#484)

* Move notifications outside AppBody

* Reset z-index to original value.
---
 src/custom/pages/App/AppMod.tsx | 3 +--
 src/custom/pages/App/index.tsx  | 2 +-
 src/index.tsx                   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/custom/pages/App/AppMod.tsx b/src/custom/pages/App/AppMod.tsx
index 3e85d5c3e8..d447f44465 100644
--- a/src/custom/pages/App/AppMod.tsx
+++ b/src/custom/pages/App/AppMod.tsx
@@ -8,7 +8,7 @@ import AddressClaimModal from 'components/claim/AddressClaimModal'
 import ErrorBoundary from 'components/ErrorBoundary'
 import Header from 'components/Header'
 import Polling from 'components/Header/Polling'
-import Popups from 'components/Popups'
+
 import Web3ReactManager from 'components/Web3ReactManager'
 import { useModalOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
@@ -122,7 +122,6 @@ export default function App(props?: { children?: ReactNode }) {
             <Header />
           </HeaderWrapper>
           <BodyWrapper>
-            <Popups />
             <Polling />
             <TopLevelModals />
             <ReferralLinkUpdater />
diff --git a/src/custom/pages/App/index.tsx b/src/custom/pages/App/index.tsx
index 36787be669..a222227841 100644
--- a/src/custom/pages/App/index.tsx
+++ b/src/custom/pages/App/index.tsx
@@ -56,7 +56,7 @@ export const BodyWrapper = styled.div`
   align-items: center;
   justify-content: center;
   flex: auto;
-  z-index: initial;
+  z-index: 1;
 
   ${({ theme }) => theme.mediaWidth.upToMedium`
     padding: 0 10px 0;
diff --git a/src/index.tsx b/src/index.tsx
index 9e2e08f215..938c84f141 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -42,6 +42,8 @@ import AppziButton from 'components/AppziButton'
 import { nodeRemoveChildFix } from 'utils/node'
 import SideBanner, { BannerType } from 'components/SideBanner'
 
+import Popups from 'components/Popups'
+
 // Node removeChild hackaround
 // based on: https://github.com/facebook/react/issues/11538#issuecomment-417504600
 nodeRemoveChildFix()