Skip to content

Enforce message in MarketWithCurrencySelector component #1081

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

Merged
pfferrari merged 2 commits into from
Apr 14, 2026
Merged

Enforce message in MarketWithCurrencySelector component #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2ec611
chore: remove unused import
pfferrari Apr 14, 2026
5a90820
fix: enforce hasMorePages in currency selector
pfferrari Apr 14, 2026
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
11 changes: 8 additions & 3 deletions ...app-elements/src/ui/forms/MarketWithCurrencySelector/HookedMarketWithCurrencySelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ListResponse, Market, Resource } from "@commercelayer/sdk"
import cn from "classnames"
import isEmpty from "lodash-es/isEmpty"
import isString from "lodash-es/isString"
import type { FC } from "react"
import { type FC, useEffect, useState } from "react"
import { useFormContext } from "react-hook-form"
import { currencyInputSelectOptions } from "#helpers/currencies"
import { useCoreApi, useCoreSdkProvider } from "#providers/CoreSdkProvider"
Expand Down Expand Up @@ -47,6 +47,7 @@ export const HookedMarketWithCurrencySelector: FC<
setValue,
formState: { defaultValues },
} = useFormContext()
const [hasMorePages, setHasMorePages] = useState(false)
const defaultMarketId = defaultValues?.[fieldNameMarket]
const defaultCurrencyCode = defaultValues?.[fieldNameCurrencyCode]

Expand All @@ -73,8 +74,11 @@ export const HookedMarketWithCurrencySelector: FC<
],
)

const hasMorePages =
(data?.meta?.pageCount != null && data.meta.pageCount > 1) ?? false
useEffect(() => {
if (data?.meta?.pageCount != null) {
setHasMorePages(data.meta.pageCount > 1)
}
}, [data])

const { data: defaultResource, isLoading: isLoadingDefaultResource } =
useCoreApi(
Expand Down Expand Up @@ -155,6 +159,7 @@ export const HookedMarketWithCurrencySelector: FC<
include: ["price_list"],
})
.then((res) => {
setHasMorePages(res.meta.pageCount > 1)
return res.map((market) => ({
label: market.name,
value: market.id,
Expand Down
1 change: 0 additions & 1 deletion packages/app-elements/src/ui/resources/useTrackingDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { Parcel as ParcelResource } from "@commercelayer/sdk"
import { useCallback, useMemo, useState } from "react"
import type { SetNonNullable, SetRequired } from "type-fest"
import { T } from "vitest/dist/chunks/reporters.d.BFLkQcL6.js"
import { formatDate, sortAndGroupByDate } from "#helpers/date"
import {
getAvatarSrcFromRate,
Expand Down
Loading