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
6294915b
Unverified
Commit
6294915b
authored
Apr 12, 2022
by
Zach Pomerantz
Committed by
GitHub
Apr 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: convert token list to context (#3712)
* fix: convert token list to context * fix: cosmos
parent
984c742d
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
73 additions
and
76 deletions
+73
-76
Swap.fixture.tsx
src/lib/components/Swap/Swap.fixture.tsx
+0
-2
index.tsx
src/lib/components/Swap/index.tsx
+2
-13
TokenSelect.fixture.tsx
src/lib/components/TokenSelect.fixture.tsx
+4
-4
index.tsx
src/lib/components/TokenSelect/index.tsx
+3
-3
Widget.tsx
src/lib/components/Widget.tsx
+6
-11
Widget.tsx
src/lib/cosmos/components/Widget.tsx
+2
-0
useSyncTokenDefaults.ts
src/lib/hooks/swap/useSyncTokenDefaults.ts
+6
-6
index.tsx
src/lib/hooks/useTokenList/index.tsx
+50
-37
No files found.
src/lib/components/Swap/Swap.fixture.tsx
View file @
6294915b
import
{
tokens
}
from
'
@uniswap/default-token-list
'
import
{
DAI
,
USDC_MAINNET
}
from
'
constants/tokens
'
import
{
useUpdateAtom
}
from
'
jotai/utils
'
import
{
useEffect
}
from
'
react
'
...
...
@@ -65,7 +64,6 @@ function Fixture() {
defaultInputAmount=
{
defaultInputAmount
}
defaultOutputTokenAddress=
{
optionsToAddressMap
[
defaultOutputToken
]
}
defaultOutputAmount=
{
defaultOutputAmount
}
tokenList=
{
tokens
}
onConnectWallet=
{
()
=>
console
.
log
(
'
onConnectWallet
'
)
}
// this handler is included as a test of functionality, but only logs
/>
)
...
...
src/lib/components/Swap/index.tsx
View file @
6294915b
import
{
Trans
}
from
'
@lingui/macro
'
import
{
TokenInfo
}
from
'
@uniswap/token-lists
'
import
{
useAtom
}
from
'
jotai
'
import
{
SwapInfoProvider
}
from
'
lib/hooks/swap/useSwapInfo
'
import
useSyncConvenienceFee
,
{
FeeOptions
}
from
'
lib/hooks/swap/useSyncConvenienceFee
'
...
...
@@ -8,7 +7,6 @@ import { usePendingTransactions } from 'lib/hooks/transactions'
import
useActiveWeb3React
from
'
lib/hooks/useActiveWeb3React
'
import
useHasFocus
from
'
lib/hooks/useHasFocus
'
import
useOnSupportedNetwork
from
'
lib/hooks/useOnSupportedNetwork
'
import
{
useIsTokenListLoaded
,
useSyncTokenList
}
from
'
lib/hooks/useTokenList
'
import
{
displayTxHashAtom
}
from
'
lib/state/swap
'
import
{
SwapTransactionInfo
,
Transaction
,
TransactionType
,
WrapTransactionInfo
}
from
'
lib/state/transactions
'
import
{
useState
}
from
'
react
'
...
...
@@ -43,18 +41,13 @@ function getTransactionFromMap(
}
export
interface
SwapProps
extends
TokenDefaults
,
FeeOptions
{
tokenList
?:
string
|
TokenInfo
[]
onConnectWallet
?:
()
=>
void
}
function
Updaters
(
props
:
SwapProps
)
{
useSyncTokenDefaults
(
props
)
useSyncConvenienceFee
(
props
)
return
null
}
export
default
function
Swap
(
props
:
SwapProps
)
{
useValidate
(
props
)
useSyncConvenienceFee
(
props
)
useSyncTokenDefaults
(
props
)
const
{
active
,
account
}
=
useActiveWeb3React
()
const
[
wrapper
,
setWrapper
]
=
useState
<
HTMLDivElement
|
null
>
(
null
)
...
...
@@ -66,14 +59,10 @@ export default function Swap(props: SwapProps) {
const
onSupportedNetwork
=
useOnSupportedNetwork
()
const
isDisabled
=
!
(
active
&&
onSupportedNetwork
)
useSyncTokenList
(
props
.
tokenList
)
const
isTokenListLoaded
=
useIsTokenListLoaded
()
const
focused
=
useHasFocus
(
wrapper
)
return
(
<>
{
isTokenListLoaded
&&
<
Updaters
{
...
props
}
/>
}
<
Header
title=
{
<
Trans
>
Swap
</
Trans
>
}
>
{
active
&&
<
Wallet
disabled=
{
!
account
}
onClick=
{
props
.
onConnectWallet
}
/>
}
<
Settings
disabled=
{
isDisabled
}
/>
...
...
src/lib/components/TokenSelect.fixture.tsx
View file @
6294915b
import
DEFAULT_TOKEN_LIST
from
'
@uniswap/default-token-list
'
import
{
useSyncTokenList
}
from
'
lib/hooks/useTokenList
'
import
{
TokenListProvider
}
from
'
lib/hooks/useTokenList
'
import
{
Modal
}
from
'
./Dialog
'
import
{
TokenSelectDialog
}
from
'
./TokenSelect
'
export
default
function
Fixture
()
{
useSyncTokenList
(
DEFAULT_TOKEN_LIST
.
tokens
)
return
(
<
Modal
color=
"module"
>
<
TokenListProvider
list=
{
DEFAULT_TOKEN_LIST
.
tokens
}
>
<
TokenSelectDialog
onSelect=
{
()
=>
void
0
}
/>
</
TokenListProvider
>
</
Modal
>
)
}
src/lib/components/TokenSelect/index.tsx
View file @
6294915b
...
...
@@ -25,9 +25,9 @@ const SearchInput = styled(StringInput)`
function
usePrefetchBalances
()
{
const
{
account
}
=
useActiveWeb3React
()
const
tokenList
=
useTokenList
()
const
[
prefetchedTokenList
,
setPrefetchedTokenList
]
=
useState
(
tokenList
)
use
Effect
(()
=>
setPrefetchedTokenList
(
tokenList
),
[
tokenList
]
)
useCurrencyBalances
(
account
,
tokenList
!==
prefetchedTokenList
?
tokenList
:
undefined
)
const
prefetchedTokenList
=
useRef
<
typeof
tokenList
>
(
)
use
CurrencyBalances
(
account
,
tokenList
!==
prefetchedTokenList
.
current
?
tokenList
:
undefined
)
prefetchedTokenList
.
current
=
tokenList
}
function
useAreBalancesLoaded
():
boolean
{
...
...
src/lib/components/Widget.tsx
View file @
6294915b
import
{
JsonRpcProvider
}
from
'
@ethersproject/providers
'
import
{
TokenInfo
}
from
'
@uniswap/token-lists
'
import
{
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
DEFAULT_LOCALE
,
SUPPORTED_LOCALES
,
SupportedLocale
}
from
'
constants/locales
'
import
{
Provider
as
AtomProvider
}
from
'
jotai
'
import
{
TransactionsUpdater
}
from
'
lib/hooks/transactions
'
import
{
ActiveWeb3Provider
}
from
'
lib/hooks/useActiveWeb3React
'
import
{
BlockNumberProvider
}
from
'
lib/hooks/useBlockNumber
'
import
{
TokenListProvider
}
from
'
lib/hooks/useTokenList
'
import
{
Provider
as
I18nProvider
}
from
'
lib/i18n
'
import
{
MulticallUpdater
,
store
as
multicallStore
}
from
'
lib/state/multicall
'
import
styled
,
{
keyframes
,
Theme
,
ThemeProvider
}
from
'
lib/theme
'
...
...
@@ -80,20 +82,12 @@ const DialogWrapper = styled.div`
}
`
function
Updaters
()
{
return
(
<>
<
MulticallUpdater
/>
<
TransactionsUpdater
/>
</>
)
}
export
type
WidgetProps
=
{
theme
?:
Theme
locale
?:
SupportedLocale
provider
?:
Eip1193Provider
|
JsonRpcProvider
jsonRpcEndpoint
?:
string
|
JsonRpcProvider
tokenList
?:
string
|
TokenInfo
[]
width
?:
string
|
number
dialog
?:
HTMLElement
|
null
className
?:
string
...
...
@@ -130,8 +124,9 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) {
<
AtomProvider
>
<
ActiveWeb3Provider
provider=
{
provider
}
jsonRpcEndpoint=
{
jsonRpcEndpoint
}
>
<
BlockNumberProvider
>
<
Updaters
/>
{
children
}
<
MulticallUpdater
/>
<
TransactionsUpdater
/>
<
TokenListProvider
list=
{
props
.
tokenList
}
>
{
children
}
</
TokenListProvider
>
</
BlockNumberProvider
>
</
ActiveWeb3Provider
>
</
AtomProvider
>
...
...
src/lib/cosmos/components/Widget.tsx
View file @
6294915b
import
{
tokens
}
from
'
@uniswap/default-token-list
'
import
{
initializeConnector
}
from
'
@web3-react/core
'
import
{
MetaMask
}
from
'
@web3-react/metamask
'
import
{
Connector
}
from
'
@web3-react/types
'
...
...
@@ -75,6 +76,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
locale=
{
locale
}
jsonRpcEndpoint=
{
jsonRpcEndpoint
===
NO_JSON_RPC
?
undefined
:
jsonRpcEndpoint
}
provider=
{
connector
?.
provider
}
tokenList=
{
tokens
}
>
{
children
}
</
Widget
>
...
...
src/lib/hooks/swap/useSyncTokenDefaults.ts
View file @
6294915b
...
...
@@ -5,9 +5,10 @@ import useActiveWeb3React from 'lib/hooks/useActiveWeb3React'
import
{
useToken
}
from
'
lib/hooks/useCurrency
'
import
useNativeCurrency
from
'
lib/hooks/useNativeCurrency
'
import
{
Field
,
Swap
,
swapAtom
}
from
'
lib/state/swap
'
import
{
useCallback
,
use
LayoutEffect
,
use
Ref
}
from
'
react
'
import
{
useCallback
,
useRef
}
from
'
react
'
import
useOnSupportedNetwork
from
'
../useOnSupportedNetwork
'
import
{
useIsTokenListLoaded
}
from
'
../useTokenList
'
export
type
DefaultAddress
=
string
|
{
[
chainId
:
number
]:
string
|
'
NATIVE
'
}
|
'
NATIVE
'
...
...
@@ -72,10 +73,9 @@ export default function useSyncTokenDefaults({
},
[
defaultInputAmount
,
defaultInputToken
,
defaultOutputAmount
,
defaultOutputToken
,
updateSwap
])
const
lastChainId
=
useRef
<
number
|
undefined
>
(
undefined
)
useLayoutEffect
(()
=>
{
if
(
chainId
&&
chainId
!==
lastChainId
.
current
)
{
const
shouldSync
=
useIsTokenListLoaded
()
&&
chainId
&&
chainId
!==
lastChainId
.
current
if
(
shouldSync
)
{
setToDefaults
()
}
lastChainId
.
current
=
chainId
}
,
[
chainId
,
setToDefaults
])
}
}
src/lib/hooks/useTokenList/index.ts
→
src/lib/hooks/useTokenList/index.ts
x
View file @
6294915b
import
{
NativeCurrency
,
Token
}
from
'
@uniswap/sdk-core
'
import
{
TokenInfo
,
TokenList
}
from
'
@uniswap/token-lists
'
import
{
atom
,
useAtom
}
from
'
jotai
'
import
{
useAtomValue
}
from
'
jotai/utils
'
import
useActiveWeb3React
from
'
lib/hooks/useActiveWeb3React
'
import
resolveENSContentHash
from
'
lib/utils/resolveENSContentHash
'
import
{
useCallback
,
useEffect
,
useMemo
,
useState
}
from
'
react
'
import
{
createContext
,
PropsWithChildren
,
useCallback
,
useContext
,
useEffect
,
useMemo
,
useState
}
from
'
react
'
import
{
WrappedTokenInfo
}
from
'
state/lists/wrappedTokenInfo
'
import
fetchTokenList
from
'
./fetchTokenList
'
...
...
@@ -14,19 +12,61 @@ import { validateTokens } from './validateTokenList'
export
const
DEFAULT_TOKEN_LIST
=
'
https://gateway.ipfs.io/ipns/tokens.uniswap.org
'
const
chainTokenMapAtom
=
atom
<
ChainTokenMap
|
null
>
(
null
)
const
MISSING_PROVIDER
=
Symbol
()
const
ChainTokenMapContext
=
createContext
<
ChainTokenMap
|
undefined
|
typeof
MISSING_PROVIDER
>
(
MISSING_PROVIDER
)
function
useChainTokenMapContext
()
{
const
chainTokenMap
=
useContext
(
ChainTokenMapContext
)
if
(
chainTokenMap
===
MISSING_PROVIDER
)
{
throw
new
Error
(
'
TokenList hooks must be wrapped in a <TokenListProvider>
'
)
}
return
chainTokenMap
}
export
function
useIsTokenListLoaded
()
{
return
Boolean
(
use
AtomValue
(
chainTokenMapAtom
))
return
Boolean
(
use
ChainTokenMapContext
(
))
}
export
function
useSyncTokenList
(
list
:
string
|
TokenInfo
[]
=
DEFAULT_TOKEN_LIST
):
void
{
export
default
function
useTokenList
():
WrappedTokenInfo
[]
{
const
{
chainId
}
=
useActiveWeb3React
()
const
chainTokenMap
=
useChainTokenMapContext
()
const
tokenMap
=
chainId
&&
chainTokenMap
?.[
chainId
]
return
useMemo
(()
=>
{
if
(
!
tokenMap
)
return
[]
return
Object
.
values
(
tokenMap
).
map
(({
token
})
=>
token
)
},
[
tokenMap
])
}
export
type
TokenMap
=
{
[
address
:
string
]:
Token
}
export
function
useTokenMap
():
TokenMap
{
const
{
chainId
}
=
useActiveWeb3React
()
const
chainTokenMap
=
useChainTokenMapContext
()
const
tokenMap
=
chainId
&&
chainTokenMap
?.[
chainId
]
return
useMemo
(()
=>
{
if
(
!
tokenMap
)
return
{}
return
Object
.
entries
(
tokenMap
).
reduce
((
map
,
[
address
,
{
token
}])
=>
{
map
[
address
]
=
token
return
map
},
{}
as
TokenMap
)
},
[
tokenMap
])
}
export
function
useQueryCurrencies
(
query
=
''
):
(
WrappedTokenInfo
|
NativeCurrency
)[]
{
return
useQueryTokens
(
query
,
useTokenList
())
}
export
function
TokenListProvider
({
list
=
DEFAULT_TOKEN_LIST
,
children
,
}:
PropsWithChildren
<
{
list
?:
string
|
TokenInfo
[]
}
>
)
{
// Error boundaries will not catch (non-rendering) async errors, but it should still be shown
const
[
error
,
setError
]
=
useState
<
Error
>
()
if
(
error
)
throw
error
const
[
chainTokenMap
,
setChainTokenMap
]
=
useAtom
(
chainTokenMapAtom
)
useEffect
(()
=>
setChainTokenMap
(
null
),
[
list
,
setChainTokenMap
])
const
[
chainTokenMap
,
setChainTokenMap
]
=
useState
<
ChainTokenMap
>
()
useEffect
(()
=>
setChainTokenMap
(
undefined
),
[
list
])
const
{
chainId
,
library
}
=
useActiveWeb3React
()
const
resolver
=
useCallback
(
...
...
@@ -70,34 +110,7 @@ export function useSyncTokenList(list: string | TokenInfo[] = DEFAULT_TOKEN_LIST
}
}
}
},
[
chainTokenMap
,
list
,
resolver
,
setChainTokenMap
])
}
export
default
function
useTokenList
():
WrappedTokenInfo
[]
{
const
{
chainId
}
=
useActiveWeb3React
()
const
chainTokenMap
=
useAtomValue
(
chainTokenMapAtom
)
const
tokenMap
=
chainId
&&
chainTokenMap
?.[
chainId
]
return
useMemo
(()
=>
{
if
(
!
tokenMap
)
return
[]
return
Object
.
values
(
tokenMap
).
map
(({
token
})
=>
token
)
},
[
tokenMap
])
}
export
type
TokenMap
=
{
[
address
:
string
]:
Token
}
},
[
chainTokenMap
,
list
,
resolver
])
export
function
useTokenMap
():
TokenMap
{
const
{
chainId
}
=
useActiveWeb3React
()
const
chainTokenMap
=
useAtomValue
(
chainTokenMapAtom
)
const
tokenMap
=
chainId
&&
chainTokenMap
?.[
chainId
]
return
useMemo
(()
=>
{
if
(
!
tokenMap
)
return
{}
return
Object
.
entries
(
tokenMap
).
reduce
((
map
,
[
address
,
{
token
}])
=>
{
map
[
address
]
=
token
return
map
},
{}
as
TokenMap
)
},
[
tokenMap
])
}
export
function
useQueryCurrencies
(
query
=
''
):
(
WrappedTokenInfo
|
NativeCurrency
)[]
{
return
useQueryTokens
(
query
,
useTokenList
())
return
<
ChainTokenMapContext
.
Provider
value=
{
chainTokenMap
}
>
{
children
}
</
ChainTokenMapContext
.
Provider
>
}
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