Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

order form: prevent side toggle on form reset #241

Merged
merged 1 commit into from
Feb 10, 2025
Merged

order form: prevent side toggle on form reset #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions app/trade/[base]/components/new-order/new-order-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,33 @@ export function NewOrderForm({
onSubmit: (values: NewOrderConfirmationProps) => void
closeButton?: React.ReactNode
}) {
// Form initializaiton
const {
order: { side, currency },
setSide,
setCurrency,
} = useServerStore((state) => state)

const isMaxOrders = useIsMaxOrders()
const { walletReadyState } = useWallets()
const defaultValues = {
amount: "",
base,
isSell: side === Side.SELL,
isQuoteCurrency: currency === "quote",
}
const defaultValues = React.useMemo(
() => ({
amount: "",
base,
isSell: side === Side.SELL,
isQuoteCurrency: currency === "quote",
}),
[side, currency, base],
)
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues,
})
// Keep form in sync with server store
React.useEffect(() => {
form.setValue("isSell", side === Side.SELL)
form.setValue("isQuoteCurrency", currency === "quote")
}, [form, side, currency])

const isMaxOrders = useIsMaxOrders()
const { walletReadyState } = useWallets()
const fees = usePredictedFees(form.watch())
const { valueInQuoteCurrency, valueInBaseCurrency } = useOrderValue(
form.watch(),
Expand All @@ -101,15 +110,7 @@ export function NewOrderForm({
const { data: price } = usePriceQuery(Token.findByTicker(base).address)

React.useEffect(() => {
form.setValue("isSell", side === Side.SELL)
}, [form, side])

React.useEffect(() => {
form.setValue("isQuoteCurrency", currency === "quote")
}, [currency, form])

React.useEffect(() => {
const subscription = form.watch((value, { name, type }) => {
const subscription = form.watch((value, { name }) => {
if (name === "isQuoteCurrency") {
setCurrency(value.isQuoteCurrency ? "quote" : "base")
if (value.isQuoteCurrency) {
Expand All @@ -127,15 +128,14 @@ export function NewOrderForm({
}
})
return () => subscription.unsubscribe()
}, [form, valueInBaseCurrency, valueInQuoteCurrency, setCurrency, setSide])
}, [form, setCurrency, setSide, valueInBaseCurrency, valueInQuoteCurrency])

React.useEffect(() => {
const unbind = orderFormEvents.on("reset", () => {
form.reset()
form.reset({ ...defaultValues })
})

return unbind
}, [form])
}, [defaultValues, form])

const { data: hasBalances } = useBackOfQueueWallet({
query: {
Expand Down
Loading