Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release v1.385.0 #4982

Merged
merged 8 commits into from
Jul 26, 2023
Merged

chore: release v1.385.0 #4982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76da7a3
perf: dont rerender all modals when opening/closing one (#4971)
woodenfurniture Jul 25, 2023
727b8ce
perf: general rendering performance improvements (#4972)
woodenfurniture Jul 25, 2023
835621d
feat: track swapper API requests in mixpanel (#4975)
gomesalexandre Jul 25, 2023
54bba0f
chore: add method & url to swapper mixpanel events (#4977)
0xApotheosis Jul 25, 2023
b1cf0d0
chore: add TradeConfirm event to exchange swapper (#4979)
0xApotheosis Jul 25, 2023
3c0feb8
fix: borked walletconnect v2 send transaction confirmation (#4978)
gomesalexandre Jul 25, 2023
8fba740
chore: use MixPanelEvents enum (#4980)
0xApotheosis Jul 26, 2023
b90352f
chore: add LiFi SDK-specific mixpanel request data (#4981)
0xApotheosis Jul 26, 2023
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
4 changes: 1 addition & 3 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export const App = () => {
const translate = useTranslate()
const showWelcomeModal = useSelector(selectShowWelcomeModal)
const showConsentBanner = useSelector(selectShowConsentBanner)
const {
nativeOnboard: { isOpen: isNativeOnboardOpen, open: openNativeOnboard },
} = useModal()
const { isOpen: isNativeOnboardOpen, open: openNativeOnboard } = useModal('nativeOnboard')

useEffect(() => {
if (shouldUpdate && !toast.isActive(updateId)) {
Expand Down
42 changes: 18 additions & 24 deletions src/Routes/Routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LanguageTypeEnum } from 'constants/LanguageTypeEnum'
import { useEffect, useMemo, useState } from 'react'
import type { Location } from 'history'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import { useDispatch } from 'react-redux'
import { matchPath, Redirect, Route, Switch, useLocation } from 'react-router-dom'
import { Layout } from 'components/Layout/Layout'
Expand All @@ -16,16 +17,9 @@ import { selectSelectedLocale } from 'state/slices/selectors'
import { useAppSelector } from 'state/store'

import { PrivateRoute } from './PrivateRoute'

function useLocationBackground() {
const location = useLocation<{ background: any }>()
const background = location.state && location.state.background
return { background, location }
}

export const Routes = () => {
export const Routes = memo(() => {
const dispatch = useDispatch()
const { background, location } = useLocationBackground()
const location = useLocation<{ background: Location }>()
const { connectDemo, state } = useWallet()
const { appRoutes } = useBrowserRouter()
const hasWallet = Boolean(state.walletInfo?.deviceId) || state.isLoadingLocalWallet
Expand Down Expand Up @@ -87,20 +81,20 @@ export const Routes = () => {
[appRoutes, hasWallet, isUnstableRoute, location],
)

const locationProps = useMemo(() => location.state?.background || location, [location])

const renderRedirect = useCallback(() => {
return shouldRedirectDemoRoute ? (
<Redirect
from='/'
to={matchDemoPath?.params.appRoute ? `/${matchDemoPath.params.appRoute}` : '/dashboard'}
/>
) : null
}, [matchDemoPath?.params.appRoute, shouldRedirectDemoRoute])

return (
<Switch location={background || location}>
<Route path='/demo'>
{() => {
return shouldRedirectDemoRoute ? (
<Redirect
from='/'
to={
matchDemoPath?.params?.appRoute ? `/${matchDemoPath.params.appRoute}` : '/dashboard'
}
/>
) : null
}}
</Route>
<Switch location={locationProps}>
<Route path='/demo'>{renderRedirect}</Route>

<Route path='/connect-wallet'>
<ConnectWallet />
Expand Down Expand Up @@ -131,4 +125,4 @@ export const Routes = () => {
</Layout>
</Switch>
)
}
})
Loading
Loading