Commit 79507a4b authored by lynn's avatar lynn Committed by Connor McEwen

fix: Remove token selector flash of old ui (#4896)

remove token selector flash of old view
parent 3a1be04a
...@@ -13,7 +13,6 @@ import useNativeCurrency from 'lib/hooks/useNativeCurrency' ...@@ -13,7 +13,6 @@ import useNativeCurrency from 'lib/hooks/useNativeCurrency'
import { getTokenFilter } from 'lib/hooks/useTokenList/filtering' import { getTokenFilter } from 'lib/hooks/useTokenList/filtering'
import { tokenComparator, useSortTokensByQuery } from 'lib/hooks/useTokenList/sorting' import { tokenComparator, useSortTokensByQuery } from 'lib/hooks/useTokenList/sorting'
import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { Edit } from 'react-feather'
import AutoSizer from 'react-virtualized-auto-sizer' import AutoSizer from 'react-virtualized-auto-sizer'
import { FixedSizeList } from 'react-window' import { FixedSizeList } from 'react-window'
import { Text } from 'rebass' import { Text } from 'rebass'
...@@ -21,10 +20,10 @@ import { useAllTokenBalances } from 'state/connection/hooks' ...@@ -21,10 +20,10 @@ import { useAllTokenBalances } from 'state/connection/hooks'
import styled, { useTheme } from 'styled-components/macro' import styled, { useTheme } from 'styled-components/macro'
import { useAllTokens, useIsUserAddedToken, useSearchInactiveTokenLists, useToken } from '../../hooks/Tokens' import { useAllTokens, useIsUserAddedToken, useSearchInactiveTokenLists, useToken } from '../../hooks/Tokens'
import { ButtonText, CloseIcon, IconWrapper, ThemedText } from '../../theme' import { CloseIcon, ThemedText } from '../../theme'
import { isAddress } from '../../utils' import { isAddress } from '../../utils'
import Column from '../Column' import Column from '../Column'
import Row, { RowBetween, RowFixed } from '../Row' import Row, { RowBetween } from '../Row'
import CommonBases from './CommonBases' import CommonBases from './CommonBases'
import { CurrencyRow, formatAnalyticsEventProperties } from './CurrencyList' import { CurrencyRow, formatAnalyticsEventProperties } from './CurrencyList'
import CurrencyList from './CurrencyList' import CurrencyList from './CurrencyList'
...@@ -37,16 +36,6 @@ const ContentWrapper = styled(Column)<{ redesignFlag?: boolean }>` ...@@ -37,16 +36,6 @@ const ContentWrapper = styled(Column)<{ redesignFlag?: boolean }>`
position: relative; position: relative;
` `
const Footer = styled.div`
width: 100%;
border-radius: 20px;
padding: 20px;
border-top-left-radius: 0;
border-top-right-radius: 0;
background-color: ${({ theme }) => theme.deprecated_bg1};
border-top: 1px solid ${({ theme }) => theme.deprecated_bg2};
`
interface CurrencySearchProps { interface CurrencySearchProps {
isOpen: boolean isOpen: boolean
onDismiss: () => void onDismiss: () => void
...@@ -56,7 +45,6 @@ interface CurrencySearchProps { ...@@ -56,7 +45,6 @@ interface CurrencySearchProps {
showCommonBases?: boolean showCommonBases?: boolean
showCurrencyAmount?: boolean showCurrencyAmount?: boolean
disableNonToken?: boolean disableNonToken?: boolean
showManageView: () => void
} }
export function CurrencySearch({ export function CurrencySearch({
...@@ -68,7 +56,6 @@ export function CurrencySearch({ ...@@ -68,7 +56,6 @@ export function CurrencySearch({
disableNonToken, disableNonToken,
onDismiss, onDismiss,
isOpen, isOpen,
showManageView,
}: CurrencySearchProps) { }: CurrencySearchProps) {
const redesignFlag = useRedesignFlag() const redesignFlag = useRedesignFlag()
const redesignFlagEnabled = redesignFlag === RedesignVariant.Enabled const redesignFlagEnabled = redesignFlag === RedesignVariant.Enabled
...@@ -269,26 +256,6 @@ export function CurrencySearch({ ...@@ -269,26 +256,6 @@ export function CurrencySearch({
</ThemedText.DeprecatedMain> </ThemedText.DeprecatedMain>
</Column> </Column>
)} )}
{!redesignFlagEnabled && (
<Footer>
<Row justify="center">
<ButtonText
onClick={showManageView}
color={theme.deprecated_primary1}
className="list-token-manage-button"
>
<RowFixed>
<IconWrapper size="16px" marginRight="6px" stroke={theme.deprecated_primaryText1}>
<Edit />
</IconWrapper>
<ThemedText.DeprecatedMain color={theme.deprecated_primaryText1}>
<Trans>Manage Token Lists</Trans>
</ThemedText.DeprecatedMain>
</RowFixed>
</ButtonText>
</Row>
</Footer>
)}
</Trace> </Trace>
</ContentWrapper> </ContentWrapper>
) )
......
...@@ -44,7 +44,7 @@ export default memo(function CurrencySearchModal({ ...@@ -44,7 +44,7 @@ export default memo(function CurrencySearchModal({
showCurrencyAmount = true, showCurrencyAmount = true,
disableNonToken = false, disableNonToken = false,
}: CurrencySearchModalProps) { }: CurrencySearchModalProps) {
const [modalView, setModalView] = useState<CurrencyModalView>(CurrencyModalView.manage) const [modalView, setModalView] = useState<CurrencyModalView>(CurrencyModalView.search)
const lastOpen = useLast(isOpen) const lastOpen = useLast(isOpen)
const userAddedTokens = useUserAddedTokens() const userAddedTokens = useUserAddedTokens()
...@@ -91,7 +91,6 @@ export default memo(function CurrencySearchModal({ ...@@ -91,7 +91,6 @@ export default memo(function CurrencySearchModal({
// used for token safety // used for token safety
const [warningToken, setWarningToken] = useState<Token | undefined>() const [warningToken, setWarningToken] = useState<Token | undefined>()
const showManageView = useCallback(() => setModalView(CurrencyModalView.manage), [setModalView])
const handleBackImport = useCallback( const handleBackImport = useCallback(
() => setModalView(prevView && prevView !== CurrencyModalView.importToken ? prevView : CurrencyModalView.search), () => setModalView(prevView && prevView !== CurrencyModalView.importToken ? prevView : CurrencyModalView.search),
[setModalView, prevView] [setModalView, prevView]
...@@ -117,7 +116,6 @@ export default memo(function CurrencySearchModal({ ...@@ -117,7 +116,6 @@ export default memo(function CurrencySearchModal({
showCommonBases={showCommonBases} showCommonBases={showCommonBases}
showCurrencyAmount={showCurrencyAmount} showCurrencyAmount={showCurrencyAmount}
disableNonToken={disableNonToken} disableNonToken={disableNonToken}
showManageView={showManageView}
/> />
) )
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment