diff --git a/web/src/components/table/tokens/TokensFilters.jsx b/web/src/components/table/tokens/TokensFilters.jsx index dfa4d259..c6841554 100644 --- a/web/src/components/table/tokens/TokensFilters.jsx +++ b/web/src/components/table/tokens/TokensFilters.jsx @@ -47,7 +47,7 @@ const TokensFilters = ({ setFormApi(api); formApiRef.current = api; }} - onSubmit={searchTokens} + onSubmit={() => searchTokens(1)} allowEmpty={true} autoComplete='off' layout='horizontal' diff --git a/web/src/hooks/tokens/useTokensData.jsx b/web/src/hooks/tokens/useTokensData.jsx index fbe430e5..063ee829 100644 --- a/web/src/hooks/tokens/useTokensData.jsx +++ b/web/src/hooks/tokens/useTokensData.jsx @@ -191,6 +191,10 @@ export const useTokensData = (openFluentNotification) => { // Search tokens function const searchTokens = async (page = 1, size = pageSize) => { + const normalizedPage = Number.isInteger(page) && page > 0 ? page : 1; + const normalizedSize = + Number.isInteger(size) && size > 0 ? size : pageSize; + const { searchKeyword, searchToken } = getFormValues(); if (searchKeyword === '' && searchToken === '') { setSearchMode(false); @@ -199,7 +203,7 @@ export const useTokensData = (openFluentNotification) => { } setSearching(true); const res = await API.get( - `/api/token/search?keyword=${encodeURIComponent(searchKeyword)}&token=${encodeURIComponent(searchToken)}&p=${page}&size=${size}`, + `/api/token/search?keyword=${encodeURIComponent(searchKeyword)}&token=${encodeURIComponent(searchToken)}&p=${normalizedPage}&size=${normalizedSize}`, ); const { success, message, data } = res.data; if (success) {