Skip to content
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 @@ -92,6 +92,7 @@ const ExplorePossibleWidget = () => {
const router = useRouter()
const txBuilderApp = useTxBuilderApp()
const isDarkMode = useDarkMode()
const isSpacesEnabled = useHasFeature(FEATURES.SPACES)
const isSwapEnabled = useHasFeature(FEATURES.NATIVE_SWAPS)
const isEurcvBoostEnabled = useHasFeature(FEATURES.EURCV_BOOST)

Expand All @@ -110,6 +111,10 @@ const ExplorePossibleWidget = () => {
if (config.id === 'earn' && isEurcvBoostEnabled !== true) {
return false
}
// Filter out spaces (Manage multiple Safes) on forks or when chain has no Spaces feature
if (config.id === 'spaces' && isSpacesEnabled !== true) {
return false
}
return true
}).map((config) => ({
id: config.id,
Expand All @@ -119,7 +124,7 @@ const ExplorePossibleWidget = () => {
iconUrl: isDarkMode ? config.iconUrl.dark : config.iconUrl.light,
link: config.getLink(router.query.safe, txBuilderApp.link),
})),
[router.query.safe, txBuilderApp, isDarkMode, isSwapEnabled, isEurcvBoostEnabled],
[router.query.safe, txBuilderApp, isDarkMode, isSpacesEnabled, isSwapEnabled, isEurcvBoostEnabled],
)

const updateScrollState = () => {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/welcome/NewSafe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import { Typography } from '@mui/material'
import css from './styles.module.css'
import WelcomeLogin from './WelcomeLogin'
import SafeLabsLogo from '@/public/images/logo-safe-labs.svg'
import SafeLogo from '@/public/images/logo.svg'
import footerCss from './welcomeFooter.module.css'
import Footer from '../common/Footer'

Expand All @@ -11,7 +11,7 @@ const NewSafe = () => {
<div className={css.loginPage}>
<div className={css.leftSide}>
<div className={css.logoContainer}>
<SafeLabsLogo className={css.logo} />
<SafeLogo className={css.logo} />
</div>
<div className={css.loginContainer}>
<WelcomeLogin />
Expand Down
19 changes: 1 addition & 18 deletions apps/web/src/components/welcome/WelcomeLogin/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppRoutes } from '@/config/routes'
import { Paper, Typography, Divider, Box, Link, Button, SvgIcon } from '@mui/material'
import { Paper, Typography, Divider, Box, Link, Button } from '@mui/material'
import css from './styles.module.css'
import { useRouter } from 'next/router'
import { CREATE_SAFE_EVENTS } from '@/services/analytics/events/createLoadSafe'
Expand All @@ -9,9 +9,6 @@ import { useHasSafes } from '@/features/myAccounts'
import Track from '@/components/common/Track'
import { useCallback, useEffect, useState } from 'react'
import WalletLogin from './WalletLogin'
import NETWORK_CONFIG from '@/config/networkConfig'
import LicensedLogo from '@/public/images/logo-licensed.svg'
import SafeLogo from '@/public/images/logo-text.svg'

const WelcomeLogin = () => {
const router = useRouter()
Expand Down Expand Up @@ -42,20 +39,6 @@ const WelcomeLogin = () => {
return (
<Paper className={css.loginCard} data-testid="welcome-login" style={{ background: '#fff' }}>
<Box className={css.loginContent}>
{NETWORK_CONFIG.IS_LICENSED ? (
<SvgIcon component={LicensedLogo} inheritViewBox sx={{ height: '72px', width: '240px', ml: '-8px' }} />
) : (
<SvgIcon
component={SafeLogo}
inheritViewBox
sx={{
height: NETWORK_CONFIG.LOGO_DIMENSIONS?.WELCOME?.H ?? '24px',
width: NETWORK_CONFIG.LOGO_DIMENSIONS?.WELCOME?.W ?? '80px',
ml: '-8px',
}}
/>
)}

<Typography variant="h6" mt={6} fontWeight={700}>
Get started
</Typography>
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/components/welcome/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

.logo {
color: #000;
height: 44px;
width: auto;
}

.rightContent {
Expand Down Expand Up @@ -99,4 +101,4 @@
max-width: 100vw;
margin-bottom: 79px;
}
}
}
Loading