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
b5f665bc
Unverified
Commit
b5f665bc
authored
Mar 13, 2023
by
eddie
Committed by
GitHub
Mar 13, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: allow defaultTokens to reset state in Widget (#6131)
fix: tdp widget bug
parent
bf337f28
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
7 deletions
+30
-7
inputs.tsx
src/components/Widget/inputs.tsx
+30
-7
No files found.
src/components/Widget/inputs.tsx
View file @
b5f665bc
...
@@ -18,6 +18,25 @@ function missingDefaultToken(tokens: SwapTokens) {
...
@@ -18,6 +18,25 @@ function missingDefaultToken(tokens: SwapTokens) {
return
!
tokens
[
Field
.
INPUT
]?.
equals
(
tokens
.
default
)
&&
!
tokens
[
Field
.
OUTPUT
]?.
equals
(
tokens
.
default
)
return
!
tokens
[
Field
.
INPUT
]?.
equals
(
tokens
.
default
)
&&
!
tokens
[
Field
.
OUTPUT
]?.
equals
(
tokens
.
default
)
}
}
function
currenciesEqual
(
a
:
Currency
|
undefined
,
b
:
Currency
|
undefined
)
{
if
(
a
&&
b
)
{
return
a
.
equals
(
b
)
}
else
{
return
!
a
&&
!
b
}
}
function
tokensEqual
(
a
:
SwapTokens
|
undefined
,
b
:
SwapTokens
|
undefined
)
{
if
(
!
a
||
!
b
)
{
return
!
a
&&
!
b
}
return
(
currenciesEqual
(
a
[
Field
.
INPUT
],
b
[
Field
.
INPUT
])
&&
currenciesEqual
(
a
[
Field
.
OUTPUT
],
b
[
Field
.
OUTPUT
])
&&
currenciesEqual
(
a
.
default
,
b
.
default
)
)
}
/**
/**
* Integrates the Widget's inputs.
* Integrates the Widget's inputs.
* Treats the Widget as a controlled component, using the app's own token selector for selection.
* Treats the Widget as a controlled component, using the app's own token selector for selection.
...
@@ -37,18 +56,21 @@ export function useSyncWidgetInputs({
...
@@ -37,18 +56,21 @@ export function useSyncWidgetInputs({
const
[
type
,
setType
]
=
useState
<
SwapValue
[
'
type
'
]
>
(
TradeType
.
EXACT_INPUT
)
const
[
type
,
setType
]
=
useState
<
SwapValue
[
'
type
'
]
>
(
TradeType
.
EXACT_INPUT
)
const
[
amount
,
setAmount
]
=
useState
<
SwapValue
[
'
amount
'
]
>
(
EMPTY_AMOUNT
)
const
[
amount
,
setAmount
]
=
useState
<
SwapValue
[
'
amount
'
]
>
(
EMPTY_AMOUNT
)
const
[
tokens
,
setTokens
]
=
useState
<
SwapTokens
>
(
defaultTokens
)
const
[
tokens
,
setTokens
]
=
useState
<
SwapTokens
>
({
...
defaultTokens
,
[
Field
.
OUTPUT
]:
defaultTokens
[
Field
.
OUTPUT
]
??
defaultTokens
.
default
,
})
// The most recent set of defaults, which can be used to check when the defaults are actually changing.
const
baseTokens
=
usePrevious
(
defaultTokens
)
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
!
tokens
[
Field
.
INPUT
]
&&
!
tokens
[
Field
.
OUTPUT
]
)
{
if
(
!
tokens
Equal
(
baseTokens
,
defaultTokens
)
)
{
setTokens
({
setTokens
({
...
tokens
,
...
defaultTokens
,
[
Field
.
INPUT
]:
defaultTokens
[
Field
.
INPUT
]
??
tokens
[
Field
.
INPUT
],
[
Field
.
OUTPUT
]:
defaultTokens
[
Field
.
OUTPUT
]
??
defaultTokens
.
default
,
[
Field
.
OUTPUT
]:
defaultTokens
[
Field
.
OUTPUT
]
??
tokens
[
Field
.
OUTPUT
]
??
defaultTokens
.
default
,
default
:
defaultTokens
.
default
,
})
})
}
}
},
[
defaultTokens
,
t
okens
])
},
[
baseTokens
,
defaultT
okens
])
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
chainId
!==
previousChainId
&&
!!
previousChainId
&&
isSupportedChain
(
chainId
))
{
if
(
chainId
!==
previousChainId
&&
!!
previousChainId
&&
isSupportedChain
(
chainId
))
{
...
@@ -117,6 +139,7 @@ export function useSyncWidgetInputs({
...
@@ -117,6 +139,7 @@ export function useSyncWidgetInputs({
if
(
missingDefaultToken
(
update
))
{
if
(
missingDefaultToken
(
update
))
{
onDefaultTokenChange
?.(
update
[
Field
.
OUTPUT
]
??
selectingToken
)
onDefaultTokenChange
?.(
update
[
Field
.
OUTPUT
]
??
selectingToken
)
return
}
}
setTokens
(
update
)
setTokens
(
update
)
},
},
...
...
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