Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LuckySwap
interface
Commits
79507a4b
Commit
79507a4b
authored
Oct 12, 2022
by
lynn
Committed by
Connor McEwen
Oct 13, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Remove token selector flash of old ui (#4896)
remove token selector flash of old view
parent
3a1be04a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
38 deletions
+3
-38
CurrencySearch.tsx
src/components/SearchModal/CurrencySearch.tsx
+2
-35
CurrencySearchModal.tsx
src/components/SearchModal/CurrencySearchModal.tsx
+1
-3
No files found.
src/components/SearchModal/CurrencySearch.tsx
View file @
79507a4b
...
...
@@ -13,7 +13,6 @@ import useNativeCurrency from 'lib/hooks/useNativeCurrency'
import
{
getTokenFilter
}
from
'
lib/hooks/useTokenList/filtering
'
import
{
tokenComparator
,
useSortTokensByQuery
}
from
'
lib/hooks/useTokenList/sorting
'
import
{
ChangeEvent
,
KeyboardEvent
,
RefObject
,
useCallback
,
useEffect
,
useMemo
,
useRef
,
useState
}
from
'
react
'
import
{
Edit
}
from
'
react-feather
'
import
AutoSizer
from
'
react-virtualized-auto-sizer
'
import
{
FixedSizeList
}
from
'
react-window
'
import
{
Text
}
from
'
rebass
'
...
...
@@ -21,10 +20,10 @@ import { useAllTokenBalances } from 'state/connection/hooks'
import
styled
,
{
useTheme
}
from
'
styled-components/macro
'
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
Column
from
'
../Column
'
import
Row
,
{
RowBetween
,
RowFixed
}
from
'
../Row
'
import
Row
,
{
RowBetween
}
from
'
../Row
'
import
CommonBases
from
'
./CommonBases
'
import
{
CurrencyRow
,
formatAnalyticsEventProperties
}
from
'
./CurrencyList
'
import
CurrencyList
from
'
./CurrencyList
'
...
...
@@ -37,16 +36,6 @@ const ContentWrapper = styled(Column)<{ redesignFlag?: boolean }>`
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
{
isOpen
:
boolean
onDismiss
:
()
=>
void
...
...
@@ -56,7 +45,6 @@ interface CurrencySearchProps {
showCommonBases
?:
boolean
showCurrencyAmount
?:
boolean
disableNonToken
?:
boolean
showManageView
:
()
=>
void
}
export
function
CurrencySearch
({
...
...
@@ -68,7 +56,6 @@ export function CurrencySearch({
disableNonToken
,
onDismiss
,
isOpen
,
showManageView
,
}:
CurrencySearchProps
)
{
const
redesignFlag
=
useRedesignFlag
()
const
redesignFlagEnabled
=
redesignFlag
===
RedesignVariant
.
Enabled
...
...
@@ -269,26 +256,6 @@ export function CurrencySearch({
</
ThemedText
.
DeprecatedMain
>
</
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
>
</
ContentWrapper
>
)
...
...
src/components/SearchModal/CurrencySearchModal.tsx
View file @
79507a4b
...
...
@@ -44,7 +44,7 @@ export default memo(function CurrencySearchModal({
showCurrencyAmount
=
true
,
disableNonToken
=
false
,
}:
CurrencySearchModalProps
)
{
const
[
modalView
,
setModalView
]
=
useState
<
CurrencyModalView
>
(
CurrencyModalView
.
manage
)
const
[
modalView
,
setModalView
]
=
useState
<
CurrencyModalView
>
(
CurrencyModalView
.
search
)
const
lastOpen
=
useLast
(
isOpen
)
const
userAddedTokens
=
useUserAddedTokens
()
...
...
@@ -91,7 +91,6 @@ export default memo(function CurrencySearchModal({
// used for token safety
const
[
warningToken
,
setWarningToken
]
=
useState
<
Token
|
undefined
>
()
const
showManageView
=
useCallback
(()
=>
setModalView
(
CurrencyModalView
.
manage
),
[
setModalView
])
const
handleBackImport
=
useCallback
(
()
=>
setModalView
(
prevView
&&
prevView
!==
CurrencyModalView
.
importToken
?
prevView
:
CurrencyModalView
.
search
),
[
setModalView
,
prevView
]
...
...
@@ -117,7 +116,6 @@ export default memo(function CurrencySearchModal({
showCommonBases=
{
showCommonBases
}
showCurrencyAmount=
{
showCurrencyAmount
}
disableNonToken=
{
disableNonToken
}
showManageView=
{
showManageView
}
/>
)
break
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment