Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

Expand Down Expand Up @@ -52,7 +53,7 @@ const ConnectDetails = ({ classes }): ReactElement => (
<ConnectButton data-testid="heading-connect-btn" />
</Block>

{isPairingSupported() && <PairingDetails classes={classes} />}
{isPairingSupported() && wrapInSuspense(<PairingDetails classes={classes} />)}
</StyledCard>
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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;
Expand All @@ -32,6 +31,17 @@ const PairingDetails = ({ classes }: { classes: Record<string, string> }): 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 (
<>
<StyledDivider />
Expand Down

This file was deleted.

3 changes: 1 addition & 2 deletions src/components/AppLayout/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -57,7 +56,7 @@ const HeaderComponent = (): React.ReactElement => {

const getProviderDetailsBased = () => {
if (!loaded) {
return wrapInSuspense(<ConnectDetails />)
return <ConnectDetails />
}

return (
Expand Down