diff --git a/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx b/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx index 732ff46815..2daabdd1ff 100644 --- a/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx +++ b/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx @@ -9,6 +9,7 @@ import Paragraph from 'src/components/layout/Paragraph' import Row from 'src/components/layout/Row' import { KeyRing } from 'src/components/AppLayout/Header/components/KeyRing' import { isPairingSupported } from 'src/logic/wallets/pairing/utils' +import { wrapInSuspense } from 'src/utils/wrapInSuspense' // We need lazy import because the component imports static css that should only be applied if the component is rendered const PairingDetails = lazy(() => import('src/components/AppLayout/Header/components/ProviderDetails/PairingDetails')) @@ -52,7 +53,7 @@ const ConnectDetails = ({ classes }): ReactElement => ( - {isPairingSupported() && } + {isPairingSupported() && wrapInSuspense()} ) diff --git a/src/components/AppLayout/Header/components/ProviderDetails/PairingDetails.tsx b/src/components/AppLayout/Header/components/ProviderDetails/PairingDetails.tsx index 2964c4e172..6d05c306b7 100644 --- a/src/components/AppLayout/Header/components/ProviderDetails/PairingDetails.tsx +++ b/src/components/AppLayout/Header/components/ProviderDetails/PairingDetails.tsx @@ -1,4 +1,4 @@ -import { CSSProperties, ReactElement } from 'react' +import { CSSProperties, ReactElement, useEffect } from 'react' import Skeleton from '@material-ui/lab/Skeleton' import RefreshIcon from '@material-ui/icons/Refresh' import IconButton from '@material-ui/core/IconButton' @@ -10,11 +10,10 @@ import Paragraph from 'src/components/layout/Paragraph' import Row from 'src/components/layout/Row' import usePairing from 'src/logic/wallets/pairing/hooks/usePairing' import { initPairing, isPairingModule } from 'src/logic/wallets/pairing/utils' - -// Hides first wallet in Onboard modal (pairing module) -import 'src/components/AppLayout/Header/components/ProviderDetails/hidePairingModule.css' import { useGetPairingUri } from 'src/logic/wallets/pairing/hooks/useGetPairingUri' +const HIDE_PAIRING_STYLE = '.bn-onboard-modal-select-wallets li:first-of-type {display: none;}' + const StyledDivider = styled(Divider)` width: calc(100% + 40px); margin-left: -20px; @@ -32,6 +31,17 @@ const PairingDetails = ({ classes }: { classes: Record }): React const isPairingLoaded = isPairingModule() usePairing() + // Hides first wallet in Onboard modal (pairing module) + useEffect(() => { + const style = document.createElement('style') + style.innerHTML = HIDE_PAIRING_STYLE + document.head.appendChild(style) + + return () => { + style.remove() + } + }, []) + return ( <> diff --git a/src/components/AppLayout/Header/components/ProviderDetails/hidePairingModule.css b/src/components/AppLayout/Header/components/ProviderDetails/hidePairingModule.css deleted file mode 100644 index 4db81d387b..0000000000 --- a/src/components/AppLayout/Header/components/ProviderDetails/hidePairingModule.css +++ /dev/null @@ -1,4 +0,0 @@ -/* Hides pairing module from Onboard wallet selection modal */ -.bn-onboard-modal-select-wallets li:first-of-type { - display: none; -} diff --git a/src/components/AppLayout/Header/index.tsx b/src/components/AppLayout/Header/index.tsx index 6dde386248..fd9564afcc 100644 --- a/src/components/AppLayout/Header/index.tsx +++ b/src/components/AppLayout/Header/index.tsx @@ -16,7 +16,6 @@ import { } from 'src/logic/wallets/store/selectors' import onboard, { loadLastUsedProvider } from 'src/logic/wallets/onboard' import { isSupportedWallet } from 'src/logic/wallets/utils/walletList' -import { wrapInSuspense } from 'src/utils/wrapInSuspense' const HeaderComponent = (): React.ReactElement => { const provider = useSelector(providerNameSelector) @@ -57,7 +56,7 @@ const HeaderComponent = (): React.ReactElement => { const getProviderDetailsBased = () => { if (!loaded) { - return wrapInSuspense() + return } return (