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
ce6c7831
Unverified
Commit
ce6c7831
authored
Mar 21, 2022
by
Zach Pomerantz
Committed by
GitHub
Mar 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: trade UI latency (#3563)
* fix: do not delay trade update * fix: do not delay initial input
parent
64e8c3ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
44 deletions
+19
-44
Input.tsx
src/lib/components/Input.tsx
+4
-27
useClientSideSmartOrderRouterTrade.ts
src/lib/hooks/routing/useClientSideSmartOrderRouterTrade.ts
+15
-17
No files found.
src/lib/components/Input.tsx
View file @
ce6c7831
import
styled
,
{
css
}
from
'
lib/theme
'
import
styled
,
{
css
}
from
'
lib/theme
'
import
{
forwardRef
,
HTMLProps
,
useCallback
,
useEffect
,
useState
}
from
'
react
'
import
{
forwardRef
,
HTMLProps
,
useCallback
}
from
'
react
'
const
Input
=
styled
.
input
`
const
Input
=
styled
.
input
`
-webkit-appearance: textfield;
-webkit-appearance: textfield;
...
@@ -76,46 +76,23 @@ interface EnforcedNumericInputProps extends NumericInputProps {
...
@@ -76,46 +76,23 @@ interface EnforcedNumericInputProps extends NumericInputProps {
enforcer
:
(
nextUserInput
:
string
)
=>
string
|
null
enforcer
:
(
nextUserInput
:
string
)
=>
string
|
null
}
}
function
isNumericallyEqual
(
a
:
string
,
b
:
string
)
{
const
[
aInteger
,
aDecimal
]
=
toParts
(
a
)
const
[
bInteger
,
bDecimal
]
=
toParts
(
b
)
return
aInteger
===
bInteger
&&
aDecimal
===
bDecimal
function
toParts
(
num
:
string
)
{
let
[
integer
,
decimal
]
=
num
.
split
(
'
.
'
)
integer
=
integer
?.
match
(
/
([
1-9
]\d
*
)
/
)?.[
1
]
||
''
decimal
=
decimal
?.
match
(
/
(\d
*
[
1-9
])
/
)?.[
1
]
||
''
return
[
integer
,
decimal
]
}
}
const
NumericInput
=
forwardRef
<
HTMLInputElement
,
EnforcedNumericInputProps
>
(
function
NumericInput
(
const
NumericInput
=
forwardRef
<
HTMLInputElement
,
EnforcedNumericInputProps
>
(
function
NumericInput
(
{
value
,
onChange
,
enforcer
,
pattern
,
...
props
}:
EnforcedNumericInputProps
,
{
value
,
onChange
,
enforcer
,
pattern
,
...
props
}:
EnforcedNumericInputProps
,
ref
ref
)
{
)
{
const
[
state
,
setState
]
=
useState
(
value
??
''
)
useEffect
(()
=>
{
if
(
!
isNumericallyEqual
(
state
,
value
))
{
setState
(
value
??
''
)
}
},
[
value
,
state
,
setState
])
const
validateChange
=
useCallback
(
const
validateChange
=
useCallback
(
(
event
)
=>
{
(
event
)
=>
{
const
nextInput
=
enforcer
(
event
.
target
.
value
.
replace
(
/,/g
,
'
.
'
))
const
nextInput
=
enforcer
(
event
.
target
.
value
.
replace
(
/,/g
,
'
.
'
))
if
(
nextInput
!==
null
)
{
if
(
nextInput
!==
null
)
{
setState
(
nextInput
??
''
)
if
(
!
isNumericallyEqual
(
nextInput
,
value
))
{
onChange
(
nextInput
)
onChange
(
nextInput
)
}
}
}
},
},
[
value
,
onChange
,
enforcer
]
[
onChange
,
enforcer
]
)
)
return
(
return
(
<
Input
<
Input
value=
{
stat
e
}
value=
{
valu
e
}
onChange=
{
validateChange
}
onChange=
{
validateChange
}
// universal input options
// universal input options
inputMode=
"decimal"
inputMode=
"decimal"
...
...
src/lib/hooks/routing/useClientSideSmartOrderRouterTrade.ts
View file @
ce6c7831
...
@@ -95,9 +95,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -95,9 +95,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
[
currencyIn
,
currencyOut
,
quoteResult
,
tradeType
]
[
currencyIn
,
currencyOut
,
quoteResult
,
tradeType
]
)
)
const
gasUseEstimateUSD
=
useStablecoinAmountFromFiatValue
(
quoteResult
?.
gasUseEstimateUSD
)
??
null
const
gasUseEstimateUSD
=
useStablecoinAmountFromFiatValue
(
quoteResult
?.
gasUseEstimateUSD
)
??
null
const
trade
=
const
trade
=
useMemo
(()
=>
{
useLast
(
useMemo
(()
=>
{
if
(
route
)
{
if
(
route
)
{
try
{
try
{
return
route
&&
transformRoutesToTrade
(
route
,
tradeType
,
gasUseEstimateUSD
)
return
route
&&
transformRoutesToTrade
(
route
,
tradeType
,
gasUseEstimateUSD
)
...
@@ -106,9 +104,8 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -106,9 +104,8 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
}
}
}
}
return
return
},
[
gasUseEstimateUSD
,
route
,
tradeType
]),
},
[
gasUseEstimateUSD
,
route
,
tradeType
])
Boolean
const
lastTrade
=
useLast
(
trade
,
Boolean
)
??
undefined
)
??
undefined
// Dont return old trade if currencies dont match.
// Dont return old trade if currencies dont match.
const
isStale
=
const
isStale
=
...
@@ -125,9 +122,9 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -125,9 +122,9 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
if
(
isStale
)
{
if
(
isStale
)
{
return
{
state
:
TradeState
.
LOADING
,
trade
:
undefined
}
return
{
state
:
TradeState
.
LOADING
,
trade
:
undefined
}
}
else
if
(
isDebouncing
)
{
}
else
if
(
isDebouncing
)
{
return
{
state
:
TradeState
.
SYNCING
,
trade
}
return
{
state
:
TradeState
.
SYNCING
,
trade
:
lastTrade
}
}
else
if
(
isLoading
)
{
}
else
if
(
isLoading
)
{
return
{
state
:
TradeState
.
LOADING
,
trade
}
return
{
state
:
TradeState
.
LOADING
,
trade
:
lastTrade
}
}
}
}
}
...
@@ -154,14 +151,15 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -154,14 +151,15 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
},
[
},
[
currencyIn
,
currencyIn
,
currencyOut
,
currencyOut
,
error
,
quoteResult
,
quoteResult
,
error
,
route
,
route
,
queryArgs
,
queryArgs
,
trade
,
trade
,
isStale
,
isStale
,
isDebouncing
,
isDebouncing
,
isLoading
,
isLoading
,
lastTrade
,
tradeType
,
tradeType
,
])
])
}
}
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