feat(swap): Slippage screen #2639
Conversation
| } | ||
|
|
||
| const normalizeInputValue = (value: string) => { | ||
| return value.length === 0 ? '0' : value.replace(',', '.').replace(/^0+(?=\d)/, '') |
There was a problem hiding this comment.
- When the input is an empty string, convert to '0'
- Convert ',' to '.'
- Remove leading zeros for inputs like '03'
There was a problem hiding this comment.
🤔 @MichalSzorad can you check to use intl number formatter? It might affect these rules. I think @nistadev updated extension.
There was a problem hiding this comment.
Thanks @stackchain I'll have a look
There was a problem hiding this comment.
@stackchain Would we need a library like this one d2l-intl to be able to parse the number?
There was a problem hiding this comment.
There was a problem hiding this comment.
I've added parsing using BigNumber, but I don't think we can format the output using BigNumber, can we? Eg when the user types 3. we do not want to convert the number to 3 and this seems what BigNumber is doing
There was a problem hiding this comment.
There was a problem hiding this comment.
This is still WIP, as I'm trying to integrate the util made by Jordi
There was a problem hiding this comment.
That is now integrated @stackchain
| @@ -103,12 +117,11 @@ const invalidSwapContext = () => { | |||
|
|
|||
| // * === SETTINGS === | |||
| // * NOTE maybe it should be moved as part of wallet settings package | |||
| export const useSwapSlippage = () => { | |||
| const {slippage} = useSwap() | |||
| export const useSwapSlippage = (swapManager: Readonly<Swap.Manager>) => { | |||
There was a problem hiding this comment.
I wanted to reuse the hook in SwapProvider to get the default values from the storage and the swapManager is responsible for storing the values.
| @@ -61,7 +61,7 @@ export const EditSlippageScreen = () => { | |||
| } | |||
|
|
|||
| const onSubmit = () => { | |||
| const parsedNumber = selectedChoice ? BigNumber(inputValue, 10) : BigNumber(selectedChoice.value, 10) | |||
| const parsedNumber = isSelectedChoiceManual ? BigNumber(inputValue, 10) : BigNumber(selectedChoice.value, 10) | |||
There was a problem hiding this comment.
according to confluence docs, it should .format to 1 decimal only, can you check it?
There was a problem hiding this comment.
@stackchain there is a validateSlippage which checks if only 1 decimal is used. The button is disabled if there are more than 1 decimals
There was a problem hiding this comment.
I've removed the decimal check from the validateSlippage, because this is now validated in Quantities.parseFromText
michaeljscript
changed the title
|
After #2646 is merged, I'll rebase and use same approach to parse slippage |
michaeljscript
changed the title
.../useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
Outdated
Show resolved
Hide resolved
Resolves YOMO-610