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
cc325b2f
Unverified
Commit
cc325b2f
authored
Oct 03, 2023
by
eddie
Committed by
GitHub
Oct 03, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: no stale trade when otherCurrency is missing (#7403)
parent
2694379c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
useDebouncedTrade.ts
src/hooks/useDebouncedTrade.ts
+1
-0
usePreviewTrade.ts
src/state/routing/usePreviewTrade.ts
+2
-1
useRoutingAPITrade.ts
src/state/routing/useRoutingAPITrade.ts
+2
-1
No files found.
src/hooks/useDebouncedTrade.ts
View file @
cc325b2f
...
@@ -96,6 +96,7 @@ export function useDebouncedTrade(
...
@@ -96,6 +96,7 @@ export function useDebouncedTrade(
const
skipBothFetches
=
!
autoRouterSupported
||
!
isWindowVisible
||
isWrap
const
skipBothFetches
=
!
autoRouterSupported
||
!
isWindowVisible
||
isWrap
const
skipRoutingFetch
=
skipBothFetches
||
isDebouncing
const
skipRoutingFetch
=
skipBothFetches
||
isDebouncing
const
skipPreviewTradeFetch
=
const
skipPreviewTradeFetch
=
skipBothFetches
||
routerPreference
===
RouterPreference
.
CLIENT
||
isPreviewTradeDebouncing
skipBothFetches
||
routerPreference
===
RouterPreference
.
CLIENT
||
isPreviewTradeDebouncing
...
...
src/state/routing/usePreviewTrade.ts
View file @
cc325b2f
...
@@ -88,7 +88,7 @@ export function usePreviewTrade(
...
@@ -88,7 +88,7 @@ export function usePreviewTrade(
const
isFetching
=
currentData
!==
tradeResult
||
!
currentData
const
isFetching
=
currentData
!==
tradeResult
||
!
currentData
return
useMemo
(()
=>
{
return
useMemo
(()
=>
{
if
(
amountSpecified
&&
queryArgs
===
skipToken
)
{
if
(
amountSpecified
&&
otherCurrency
&&
queryArgs
===
skipToken
)
{
return
{
return
{
state
:
TradeState
.
STALE
,
state
:
TradeState
.
STALE
,
trade
:
tradeResult
?.
trade
,
trade
:
tradeResult
?.
trade
,
...
@@ -124,5 +124,6 @@ export function usePreviewTrade(
...
@@ -124,5 +124,6 @@ export function usePreviewTrade(
tradeResult
?.
state
,
tradeResult
?.
state
,
tradeResult
?.
trade
,
tradeResult
?.
trade
,
currentData
?.
trade
,
currentData
?.
trade
,
otherCurrency
,
])
])
}
}
src/state/routing/useRoutingAPITrade.ts
View file @
cc325b2f
...
@@ -104,7 +104,7 @@ export function useRoutingAPITrade<TTradeType extends TradeType>(
...
@@ -104,7 +104,7 @@ export function useRoutingAPITrade<TTradeType extends TradeType>(
const
isFetching
=
currentData
!==
tradeResult
||
!
currentData
const
isFetching
=
currentData
!==
tradeResult
||
!
currentData
return
useMemo
(()
=>
{
return
useMemo
(()
=>
{
if
(
amountSpecified
&&
queryArgs
===
skipToken
)
{
if
(
amountSpecified
&&
otherCurrency
&&
queryArgs
===
skipToken
)
{
return
{
return
{
state
:
TradeState
.
STALE
,
state
:
TradeState
.
STALE
,
trade
:
tradeResult
?.
trade
,
trade
:
tradeResult
?.
trade
,
...
@@ -140,5 +140,6 @@ export function useRoutingAPITrade<TTradeType extends TradeType>(
...
@@ -140,5 +140,6 @@ export function useRoutingAPITrade<TTradeType extends TradeType>(
tradeResult
?.
state
,
tradeResult
?.
state
,
tradeResult
?.
trade
,
tradeResult
?.
trade
,
currentData
?.
trade
,
currentData
?.
trade
,
otherCurrency
,
])
])
}
}
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