@redneckz/wildless-cms-uni-blocks 0.14.762 → 0.14.763

package/src/components/CreditCardForm/CreditCardFormStatus.tsx

@@ -3,11 +3,11 @@ import { useMobileMode } from '../../hooks/useMobileMode';
 import { type DescriptionProps, type LabelProps } from '../../model/HeadlineType';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
-import { InfoCard, type InfoCardProps } from '../../ui-kit/InfoCard/InfoCard';
-import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Link } from '../../ui-kit/Link/Link';
 import { Text } from '../../ui-kit/Text/Text';
 import { TimerCircle } from '../../ui-kit/TimerCircle/TimerCircle';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
+import { noop } from '../../utils/noop';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 
@@ -15,29 +15,25 @@ type CreditCardFormStatusProps = UniBlockProps & {
   title?: string;
   description?: string;
   interval?: number;
-  intervalExpireAction?: () => void;
   sectionInfoTitle?: string;
   sectionInfo?: (LabelProps & DescriptionProps)[];
   sectionAdditionalTitle?: string;
   sectionInfoAdditional?: (LabelProps & DescriptionProps)[];
   buttonText?: string;
-  infoCard?: InfoCardProps;
+  onExpire?: () => void;
 };
 
 export const CreditCardFormStatus = JSX<CreditCardFormStatusProps>(
   ({
     title,
     description: dsc,
-    infoCard,
     sectionInfoTitle,
     sectionInfo,
     sectionAdditionalTitle,
     sectionInfoAdditional,
     buttonText,
     interval,
-    intervalExpireAction = () => {
-      return;
-    },
+    onExpire = noop,
     ...props
   }) => (
     <BlockWrapper {...props}>
@@ -50,23 +46,12 @@ export const CreditCardFormStatus = JSX<CreditCardFormStatusProps>(
           padding="p-xl"
           className="w-full"
         />
-        {interval ? (
-          <TimerCircle interval={interval} intervalExpireAction={intervalExpireAction} />
-        ) : null}
+        {interval ? <TimerCircle interval={interval} onEnd={onExpire} /> : null}
       </div>
       <SectionInfo title={sectionInfoTitle} items={sectionInfo} />
       <SectionInfo title={sectionAdditionalTitle} items={sectionInfoAdditional} countColumns />
-      {infoCard?.__html ? (
-        <InfoCard
-          __html={infoCard?.__html}
-          icon={infoCard?.icon}
-          link={{
-            text: infoCard?.link?.text,
-          }}
-        />
-      ) : null}
       {buttonText ? (
-        <LinkButton href="/natural" text={buttonText} version="primary" className="w-full mt-lg" />
+        <Link href="/natural" text={buttonText} version="primary" className="w-full mt-lg" />
       ) : null}
     </BlockWrapper>
   ),

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -28,27 +28,27 @@ export const CreditCardFormStatusTracker = JSX(() => {
   }, [taskId]);
 
   const trackStatus = useCallback(
-    async (stopInterval: () => void) => {
+    async (stop: () => void) => {
       const res = await getTaskStatus({ taskId });
 
       if (res && res?.statusCd !== STATUS_TYPE.process) {
-        stopInterval();
+        stop();
         setStatus(res.statusCd);
       }
     },
     [taskId],
   );
 
-  useInterval(trackStatus, 30000);
+  useInterval(trackStatus, 30_000);
 
-  const handleExpire = () => setStatus(STATUS_TYPE.rework);
+  const handleExpire = useCallback(() => setStatus(STATUS_TYPE.rework), []);
 
   return renderStatus(status, handleExpire);
 });
 
 const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
-    IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
+    IN_PROCESS: <PendingStatusContent onExpire={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
     FAILED: <FailedStatusContent />,
     DRAFT: <FailedStatusContent />,

package/src/components/CreditCardForm/PendingStatusContent.tsx

@@ -2,28 +2,26 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
 
-export const PendingStatusContent = JSX(
-  ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const { statusInfo } = useRetailFormStore();
+export const PendingStatusContent = JSX(({ onExpire }: { onExpire: () => void }) => {
+  const { statusInfo } = useRetailFormStore();
 
-    return (
-      <CreditCardFormStatus
-        interval={300}
-        intervalExpireAction={handleExpireTimer}
-        title="Заявка успешно отправлена"
-        description="Не закрывайте окно, скоро сообщим результат"
-        sectionInfoTitle="Заявленные условия по кредиту"
-        sectionInfo={[
-          {
-            label: 'Название продукта',
-            description: 'Кредитная карта',
-          },
-          {
-            label: 'Категория',
-            description: statusInfo?.cardCategory,
-          },
-        ]}
-      />
-    );
-  },
-);
+  return (
+    <CreditCardFormStatus
+      interval={300}
+      title="Заявка успешно отправлена"
+      description="Не закрывайте окно, скоро сообщим результат"
+      sectionInfoTitle="Заявленные условия по кредиту"
+      sectionInfo={[
+        {
+          label: 'Название продукта',
+          description: 'Кредитная карта',
+        },
+        {
+          label: 'Категория',
+          description: statusInfo?.cardCategory,
+        },
+      ]}
+      onExpire={onExpire}
+    />
+  );
+});

package/src/components/CreditCardForm/StepsNavigationButtons.tsx

@@ -15,7 +15,7 @@ export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
 
     return (
       <div className="flex justify-between gap-m">
-        <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
+        <Button version="secondary" disabled={isFirstStep} onClick={onPrevStep}>
           Назад
         </Button>
         <SubmitButton isLoading={isSending}>

package/src/components/CreditForm/CreditFormStatus.tsx

@@ -3,11 +3,11 @@ import { useMobileMode } from '../../hooks/useMobileMode';
 import { type DescriptionProps, type LabelProps } from '../../model/HeadlineType';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
-import { InfoCard, type InfoCardProps } from '../../ui-kit/InfoCard/InfoCard';
-import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Link } from '../../ui-kit/Link/Link';
 import { Text } from '../../ui-kit/Text/Text';
 import { TimerCircle } from '../../ui-kit/TimerCircle/TimerCircle';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
+import { noop } from '../../utils/noop';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 
@@ -15,29 +15,25 @@ type CreditFormStatusProps = UniBlockProps & {
   title?: string;
   description?: string;
   interval?: number;
-  intervalExpireAction?: () => void;
   sectionInfoTitle?: string;
   sectionInfo?: (LabelProps & DescriptionProps)[];
   sectionAdditionalTitle?: string;
   sectionInfoAdditional?: (LabelProps & DescriptionProps)[];
   buttonText?: string;
-  infoCard?: InfoCardProps;
+  onExpire?: () => void;
 };
 
 export const CreditFormStatus = JSX<CreditFormStatusProps>(
   ({
     title,
     description: dsc,
-    infoCard,
     sectionInfoTitle,
     sectionInfo,
     sectionAdditionalTitle,
     sectionInfoAdditional,
     buttonText,
     interval,
-    intervalExpireAction = () => {
-      return;
-    },
+    onExpire = noop,
     ...props
   }) => {
     return (
@@ -51,28 +47,12 @@ export const CreditFormStatus = JSX<CreditFormStatusProps>(
             padding="p-xl"
             className="w-full"
           />
-          {interval ? (
-            <TimerCircle interval={interval} intervalExpireAction={intervalExpireAction} />
-          ) : null}
+          {interval ? <TimerCircle interval={interval} onEnd={onExpire} /> : null}
         </div>
         <SectionInfo title={sectionInfoTitle} items={sectionInfo} />
         <SectionInfo title={sectionAdditionalTitle} items={sectionInfoAdditional} countColumns />
-        {infoCard?.__html ? (
-          <InfoCard
-            __html={infoCard?.__html}
-            icon={infoCard?.icon}
-            link={{
-              text: infoCard?.link?.text,
-            }}
-          />
-        ) : null}
         {buttonText ? (
-          <LinkButton
-            href="/natural"
-            text={buttonText}
-            version="primary"
-            className="w-full mt-lg"
-          />
+          <Link href="/natural" text={buttonText} version="primary" className="w-full mt-lg" />
         ) : null}
       </BlockWrapper>
     );

package/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -27,27 +27,27 @@ export const CreditFormStatusTracker = JSX(() => {
   }, [taskId]);
 
   const trackStatus = useCallback(
-    async (stopInterval: () => void) => {
+    async (stop: () => void) => {
       const res = await getTaskStatus({ taskId });
 
       if (res && res?.statusCd !== STATUS_TYPE.process) {
-        stopInterval();
+        stop();
         setStatus(res.statusCd);
       }
     },
     [taskId],
   );
 
-  useInterval(trackStatus, 30000);
+  useInterval(trackStatus, 30_000);
 
-  const handleExpire = () => setStatus(STATUS_TYPE.rework);
+  const handleExpire = useCallback(() => setStatus(STATUS_TYPE.rework), []);
 
   return renderStatus(status, handleExpire);
 });
 
-const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
+const renderStatus = (status: STATUS_TYPE, onExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
-    IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
+    IN_PROCESS: <PendingStatusContent onExpire={onExpire} />,
     CANCELLED: <FailedStatusContent />,
     FAILED: <FailedStatusContent />,
     DRAFT: <FailedStatusContent />,

package/src/components/CreditForm/PendingStatusContent.tsx

@@ -2,40 +2,38 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditFormStatus } from './CreditFormStatus';
 
-export const PendingStatusContent = JSX(
-  ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const { statusInfo } = useRetailFormStore();
+export const PendingStatusContent = JSX(({ onExpire }: { onExpire: () => void }) => {
+  const { statusInfo } = useRetailFormStore();
 
-    return (
-      <CreditFormStatus
-        interval={300}
-        intervalExpireAction={handleExpireTimer}
-        title="Заявка успешно отправлена"
-        description="Не закрывайте окно, скоро сообщим результат"
-        sectionInfoTitle="Заявленные условия по кредиту"
-        sectionInfo={[
-          {
-            label: 'Название продукта',
-            description: 'Кредит на любые цели',
-          },
-          {
-            label: 'Цель кредита',
-            description: 'На любые цели',
-          },
-          {
-            label: 'Сумма',
-            description: `${statusInfo?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
-          },
-          {
-            label: 'Срок кредита',
-            description: `${statusInfo?.calculator?.monthsValue ?? '0'} мес`,
-          },
-          {
-            label: 'Тип платежа',
-            description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
-          },
-        ]}
-      />
-    );
-  },
-);
+  return (
+    <CreditFormStatus
+      interval={300}
+      title="Заявка успешно отправлена"
+      description="Не закрывайте окно, скоро сообщим результат"
+      sectionInfoTitle="Заявленные условия по кредиту"
+      sectionInfo={[
+        {
+          label: 'Название продукта',
+          description: 'Кредит на любые цели',
+        },
+        {
+          label: 'Цель кредита',
+          description: 'На любые цели',
+        },
+        {
+          label: 'Сумма',
+          description: `${statusInfo?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
+        },
+        {
+          label: 'Срок кредита',
+          description: `${statusInfo?.calculator?.monthsValue ?? '0'} мес`,
+        },
+        {
+          label: 'Тип платежа',
+          description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+        },
+      ]}
+      onExpire={onExpire}
+    />
+  );
+});

package/src/components/CreditForm/StepsNavigationButtons.tsx

@@ -15,7 +15,7 @@ export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
 
     return (
       <div className={'flex justify-between gap-m'}>
-        <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
+        <Button version="secondary" disabled={isFirstStep} onClick={onPrevStep}>
           Назад
         </Button>
         <SubmitButton isLoading={isSending}>

package/src/components/Footer/Footer.tsx

@@ -1,4 +1,5 @@
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { Link } from '../../ui-kit/Link/Link';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { Sitemap } from '../../ui-kit/Sitemap/Sitemap';
 import { UniBlock } from '../../UniBlock/UniBlock';
@@ -25,8 +26,6 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
     otherLinks = [],
   } = footer ?? {};
 
-  const linkStyle = '!text-left text-s font-light';
-
   return (
     <BlockWrapper
       tag="footer"
@@ -55,9 +54,7 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
             </SocialMedia>
           ))}
           {otherLinks.map((_, i) => (
-            <LinkButton key={String(i)} className={linkStyle} version="link" {..._}>
-              {_?.text}
-            </LinkButton>
+            <Link key={`${_.href}_${i}`} className="text-s font-light" {..._} />
           ))}
         </div>
       </div>

package/src/components/GrantSupport/GrantSupport.tsx

@@ -2,8 +2,7 @@ import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspectsWithInclude';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { getRegularButtonClasses } from '../../ui-kit/LinkButton/getRegularButtonClasses';
-import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Link } from '../../ui-kit/Link/Link';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
@@ -17,12 +16,7 @@ export const GrantSupport = UniBlock<GrantSupportProps>(
     const [region, setRegion] = useState({ key: '' });
     const regions = regionSource?.regions ?? [];
 
-    const buttonStyle = getRegularButtonClasses({
-      className: 'text-white',
-      version: button?.version || 'primary',
-    });
     const regionHref = regions?.find((_) => _.name === region.key)?.href;
-    const buttonText = button?.text ? button.text : 'Перейти';
 
     return (
       <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
@@ -40,14 +34,15 @@ export const GrantSupport = UniBlock<GrantSupportProps>(
           ) : null}
           {regionHref ? (
             <div className="text-center">
-              <LinkButton
+              <Link
+                className={style('w-full @xl:w-auto')}
                 href={regionHref}
                 target="_blank"
-                className={style('p-m w-full @xl:w-auto', buttonStyle)}
+                version={button?.version ?? 'primary'}
                 data={getAspectsWithInclude(data, region?.key)}
               >
-                {buttonText}
-              </LinkButton>
+                {button?.text ? button.text : 'Перейти'}
+              </Link>
             </div>
           ) : null}
         </div>

package/src/components/OfficesAtmsMap/FiltrationForm.tsx

@@ -50,6 +50,7 @@ export const FiltrationForm = JSX<RenderFiltrationFormProps>(
                     label={isUnfolded ? 'Меньше фильтров' : 'Больше фильтров'}
                     isUnfolded={isUnfolded}
                     embedded
+                    short
                     onClick={toggle}
                   />
                 ) : null}

package/src/components/OfficesAtmsMap/FoldableCardContent.tsx

@@ -13,7 +13,7 @@ export const FoldableCardContent = JSX(({ children }) => {
       <Foldable className="block sm:hidden">
         <FoldableSection isUnfolded={isUnfolded}>{children}</FoldableSection>
         <DefaultFoldButton
-          className="w-full my-m mr-m border-b border-solid border-main-divider"
+          className="my-m mr-m border-b border-solid border-main-divider"
           label={isUnfolded ? 'Скрыть' : 'Подробнее'}
           isUnfolded={isUnfolded}
           embedded

package/src/components/ProductBlock/renderBackwardButton.tsx

@@ -11,6 +11,7 @@ type BackwardButtonProps = {
   alwaysVisible?: boolean;
 };
 
+// TODO Заменить LinkButton на Button и применить RoundedIcon
 export function renderBackwardButton({
   version,
   handleClick,

package/src/components/ProductGallery/ProductGallery.tsx

@@ -1,7 +1,7 @@
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { BaseProductTile } from '../../ui-kit/BaseProductTile/BaseProductTile';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { ScrollLeftButton, ScrollRightButton } from '../../ui-kit/LinkButton/ArrowButton';
+import { ArrowLeftButton, ArrowRightButton } from '../../ui-kit/LinkButton/ArrowButton';
 import { SwipeListContainer } from '../../ui-kit/SwipeListControl/SwipeListContainer';
 import { useSwipeListScroll } from '../../ui-kit/SwipeListControl/useSwipeListScroll';
 import { UniBlock } from '../../UniBlock/UniBlock';
@@ -57,13 +57,13 @@ export const ProductGallery = UniBlock<ProductGalleryProps>(
             {slides.map(renderNavButton({ activeSlideIndex, onClick: setActiveSlideIndex }))}
           </SwipeListContainer>
           {scroll.canScrollLeft ? (
-            <ScrollLeftButton
+            <ArrowLeftButton
               className={style('left-6', scrollButtonStyle)}
               onClick={scroll.scrollLeft}
             />
           ) : null}
           {scroll.canScrollRight ? (
-            <ScrollRightButton
+            <ArrowRightButton
               className={style('right-6', scrollButtonStyle)}
               onClick={scroll.scrollRight}
             />

package/src/components/RollupItem/RollupItem.tsx

@@ -46,7 +46,7 @@ export const RollupItem = UniBlock<RollupItemProps>(
     const isAccordion = foldButtonVersion === 'accordion';
     const foldButton = (
       <DefaultFoldButton
-        className={style('w-full', { 'text-h6 my-lg': isAccordion })}
+        className={style(isAccordion ? 'text-h6 my-lg' : 'text-h4')}
         label={label}
         isUnfolded={isUnfolded}
         embedded={isAccordion}

package/src/components/SafeDepositRental/SafeDepositRentalFields.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type Region } from '../../hooks/useRegions';
-import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Button } from '../../ui-kit/Button/Button';
 import { Text } from '../../ui-kit/Text/Text';
 import { RadioButtons } from './RadioButtons';
 import { RegionsAndBranches } from './RegionsAndBranches';
@@ -57,7 +57,9 @@ export const SafeDepositRentalFields = JSX<SafeDepositRentalFieldsProps>(
       </div>
       <div className="contents @md:flex justify-between items-center gap-m">
         <RadioButtons />
-        <LinkButton text="Офисы на карте" version="primary" onClick={onClick} className="order-6" />
+        <Button className="order-6" version="primary" onClick={onClick}>
+          Офисы на карте
+        </Button>
       </div>
     </div>
   ),

package/src/components/TariffsTable/TariffsTable.tsx

@@ -63,7 +63,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
                 {visibleRows}
                 <FoldableSection isUnfolded={isUnfolded}>{hiddenRows}</FoldableSection>
               </TariffsTableWrapper>
-              <DefaultFoldButton className="w-full" isUnfolded={isUnfolded} onClick={toggle} />
+              <DefaultFoldButton className="text-h4" isUnfolded={isUnfolded} onClick={toggle} />
             </Foldable>
           ) : (
             <TariffsTableWrapper controls={controls}>{rows}</TariffsTableWrapper>

package/src/hooks/useInterval.ts

@@ -2,13 +2,17 @@ import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 
 export const useInterval = (handler: (stop: () => void) => void, period: number) => {
   const timer = useRef<any | null>(null);
-  const clearTimer = useCallback(() => timer.current && clearInterval(timer.current as number), []);
+  const stop = useCallback(() => clearInterval(timer.current as number), []);
+  const start = useCallback(() => {
+    stop();
+    timer.current = setInterval(() => handler(stop), period);
+  }, [handler, period, stop]);
 
   useEffect(() => {
-    timer.current = setInterval(() => handler(clearTimer), period);
+    start();
 
-    return clearTimer;
-  }, [handler, period]);
+    return stop;
+  }, [start, stop]);
 
-  return clearTimer;
+  return { start, stop };
 };

package/src/hooks/useLink.ts

@@ -9,13 +9,11 @@ import { adjustHref } from '../utils/adjustHref';
 import { getBasePath } from '../utils/getBasePath';
 import { hasPrefix, isLocalURL } from '../utils/url';
 
-interface Clickable {
+export interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
 
 export function useLink() {
-  const basePath = getBasePath(env.SITE_URL);
-
   const router = useRouter();
   const { closeAll } = useDialogManager();
 
@@ -26,38 +24,21 @@ export function useLink() {
       ...props,
       href,
       'aria-label': props.text,
-      onClick: handlerDecorator(handleHref({ ...props, href })),
+      onClick: handlerDecorator((ev?: PreventableEvent) => {
+        props.onClick?.(ev);
+
+        const basePath = getBasePath(env.SITE_URL);
+        if (isClientRouting(href, props.target, basePath)) {
+          closeAll();
+          ev?.preventDefault();
+          router.push(adjustBase(href, basePath));
+        }
+      }),
     };
   };
-
-  function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
-    return (ev?: PreventableEvent) => {
-      onClick?.(ev);
-
-      if (checkIsRemote(href, target, basePath)) {
-        //? Native routing
-        return;
-      }
-
-      closeAll();
-
-      //? Client routing
-      ev?.preventDefault();
-      router.push(adjustBase(href, basePath));
-    };
-  }
 }
 
-const checkIsRemote = (href?: string, target?: Target, basePath?: string) => {
-  if (!isLocalURL(href, target)) {
-    return true;
-  }
-
-  const subPortals = env.SUB_PORTALS?.split(',');
-
-  if (subPortals?.some((_) => hasPrefix(href, _))) {
-    return true;
-  }
-
-  return !hasPrefix(href, basePath || '/');
-};
+const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
+  isLocalURL(href, target) &&
+  !env.SUB_PORTALS?.split(',')?.some(hasPrefix(href)) &&
+  hasPrefix(href)(basePath || '/');

package/src/ui-kit/BaseFiltration/GridBlocks.tsx

@@ -38,7 +38,7 @@ export const GridBlocks = JSX<GridBlocksProps>(
             {isOdd(hiddenBlocks.length) ? <AdTile className="col-span-6" {...rest} /> : null}
           </FoldableSection>
           <DefaultFoldButton
-            className={style('w-full', { hidden: topItemsCount < 1 })}
+            className={style('text-h4', { hidden: topItemsCount < 1 })}
             label={label}
             isUnfolded={isUnfolded}
             disabled={!hiddenBlocks?.length}