Skip to content

Commit 3295808

Browse files
committed
Change semantics of getThemesForNetworks function
Up to now, this function has returned all the themes, for all networks. Now it will only return one theme, for the requested network.
1 parent 97e2bf7 commit 3295808

5 files changed

Lines changed: 18 additions & 14 deletions

File tree

src/app/components/ThemeByScope/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FC, ReactNode } from 'react'
22
import { Network } from '../../../types/network'
33
import { ThemeProvider } from '@mui/material/styles'
4-
import { getThemesForNetworks } from '../../../styles/theme'
4+
import { getThemeForNetwork } from '../../../styles/theme'
55
import CssBaseline from '@mui/material/CssBaseline'
66
import { fixedNetwork } from '../../utils/route-utils'
77

@@ -10,7 +10,7 @@ export const ThemeByScope: FC<{ network: Network; isRootTheme: boolean; children
1010
isRootTheme,
1111
children,
1212
}) => (
13-
<ThemeProvider theme={getThemesForNetworks()[network]}>
13+
<ThemeProvider theme={getThemeForNetwork(network)}>
1414
{isRootTheme && <CssBaseline />}
1515
{children}
1616
</ThemeProvider>

src/app/pages/SearchResultsPage/GlobalSearchResultsView.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
Network,
1616
} from '../../../types/network'
1717
import { HideMoreResults, ShowMoreResults } from './notifications'
18-
import { getThemesForNetworks } from '../../../styles/theme'
18+
import { getThemeForNetwork } from '../../../styles/theme'
1919
import { orderByLayer } from '../../../types/layers'
2020
import { useRedirectIfSingleResult } from './useRedirectIfSingleResult'
2121
import { SearchParams } from '../../components/Search/search-utils'
@@ -30,7 +30,6 @@ export const GlobalSearchResultsView: FC<{
3030
const [othersOpen, setOthersOpen] = useState(false)
3131
useRedirectIfSingleResult(undefined, searchParams, searchResults)
3232

33-
const themes = getThemesForNetworks()
3433
const networkNames = getNetworkNames(t)
3534
const { searchTerm } = searchParams
3635

@@ -51,7 +50,7 @@ export const GlobalSearchResultsView: FC<{
5150
}
5251

5352
const otherNetworks = RouteUtils.getEnabledNetworks().filter(isNotMainnet)
54-
const notificationTheme = themes[Network.testnet]
53+
const notificationTheme = getThemeForNetwork(Network.testnet)
5554
const mainnetResults = searchResults.filter(isOnMainnet).sort(orderByLayer)
5655
const otherResults = searchResults.filter(isNotOnMainnet).sort(orderByLayer)
5756

src/app/pages/SearchResultsPage/ScopedSearchResultsView.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
getInverseFilterForScope,
88
SearchScope,
99
} from '../../../types/searchScope'
10-
import { getThemesForNetworks } from '../../../styles/theme'
10+
import { getThemeForNetwork } from '../../../styles/theme'
1111
import { RouteUtils } from '../../utils/route-utils'
1212
import { SearchResults } from './hooks'
1313
import { SearchResultsList } from './SearchResultsList'
@@ -27,12 +27,13 @@ export const ScopedSearchResultsView: FC<{
2727
const { t } = useTranslation()
2828
const [othersOpen, setOthersOpen] = useState(false)
2929
const networkNames = getNetworkNames(t)
30-
const themes = getThemesForNetworks()
3130
const isInWantedScope = getFilterForScope(wantedScope)
3231
const isNotInWantedScope = getInverseFilterForScope(wantedScope)
3332
const wantedResults = searchResults.filter(isInWantedScope)
3433
const otherResults = searchResults.filter(isNotInWantedScope)
35-
const notificationTheme = themes[otherResults.some(isOnMainnet) ? Network.mainnet : Network.testnet]
34+
const notificationTheme = getThemeForNetwork(
35+
otherResults.some(isOnMainnet) ? Network.mainnet : Network.testnet,
36+
)
3637

3738
useRedirectIfSingleResult(wantedScope, searchParams, searchResults)
3839

src/app/pages/SearchResultsPage/SearchResultsList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
TokenResult,
1616
TransactionResult,
1717
} from './hooks'
18-
import { getThemesForNetworks } from '../../../styles/theme'
18+
import { getThemeForNetwork } from '../../../styles/theme'
1919
import { Network } from '../../../types/network'
2020
import { SubPageCard } from '../../components/SubPageCard'
2121
import { AllTokenPrices } from '../../../coin-gecko/api'
@@ -44,7 +44,7 @@ export const SearchResultsList: FC<{
4444
if (!numberOfResults) {
4545
return null
4646
}
47-
const theme = getThemesForNetworks()[networkForTheme]
47+
const theme = getThemeForNetwork(networkForTheme)
4848

4949
return (
5050
<ResultListFrame theme={theme}>

src/styles/theme/index.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ export { testnetTheme } from './testnet/theme'
99
export const tooltipDelay = 500
1010
export const typingDelay = 1000
1111

12-
export const getThemesForNetworks: () => Record<Network, Theme> = () => ({
13-
[Network.mainnet]: defaultTheme,
14-
[Network.testnet]: testnetTheme,
15-
})
12+
export const getThemeForNetwork = (network: Network): Theme => {
13+
switch (network) {
14+
case Network.mainnet:
15+
return defaultTheme
16+
case Network.testnet:
17+
return testnetTheme
18+
}
19+
}

0 commit comments

Comments
 (0)