diff --git a/src/api/tariff.ts b/src/api/tariff.ts index f5a6ddb..b65563e 100644 --- a/src/api/tariff.ts +++ b/src/api/tariff.ts @@ -65,14 +65,21 @@ export async function getCustomTariffs( signal: AbortSignal | undefined ): Promise<[ServiceKeyToPrivilegesMap | null, string?]> { try { - const getCustomTariffsResponse = await makeRequest({ + const customTariffsResponse = await makeRequest({ url: apiUrl + "/privilege/service", signal, method: "get", useToken: true, }) - return [getCustomTariffsResponse] + const tempCustomTariffsResponse = { + ...customTariffsResponse, + squiz: customTariffsResponse.squiz.filter( + ({ name }) => !name.toLocaleLowerCase().includes("шильдик") + ), + }; + + return [tempCustomTariffsResponse] } catch (nativeError) { const [error] = parseAxiosError(nativeError) diff --git a/src/pages/Payment/Payment.tsx b/src/pages/Payment/Payment.tsx index da3f3a2..5443463 100644 --- a/src/pages/Payment/Payment.tsx +++ b/src/pages/Payment/Payment.tsx @@ -53,7 +53,7 @@ export default function Payment() { const isTablet = useMediaQuery(theme.breakpoints.down(1000)); const [selectedPaymentMethod, setSelectedPaymentMethod] = - useState(null); + useState("rspay"); const [warnModalOpen, setWarnModalOpen] = useState(false); const [sorryModalOpen, setSorryModalOpen] = useState(false); const [paymentValueField, setPaymentValueField] = useState("0"); @@ -85,6 +85,10 @@ export default function Payment() { }, [selectedPaymentMethod]); async function handleChoosePaymentClick() { + if (!selectedPaymentMethod) { + return; + } + if (Number(paymentValueField) === 0) { return; } @@ -175,7 +179,7 @@ export default function Payment() { /> ))} {