@redneckz/wildless-cms-uni-blocks 0.12.11 → 0.12.12

package/src/components/CarouselProductCard/CarouselProductCard.fixture.tsx

@@ -56,9 +56,10 @@ export const PRODUCT_CARD_SMALL: CarouselProductCardContent = {
   isButtonFullWidth: false,
 };
 
-const CAROUSEL_PRODUCT_CARD = <CarouselProductCard {...PRODUCT_CARD} />;
+const CAROUSEL_PRODUCT_CARD = <CarouselProductCard className="col-span-4" {...PRODUCT_CARD} />;
 const CAROUSEL_PRODUCT_CARD_SECONDARY = (
   <CarouselProductCard
+    className="col-span-4"
     {...PRODUCT_CARD}
     version="secondary"
     isDotted={true}
@@ -66,7 +67,9 @@ const CAROUSEL_PRODUCT_CARD_SECONDARY = (
     isButtonFullWidth={false}
   />
 );
-const CAROUSEL_PRODUCT_CARD_SMALL = <CarouselProductCard {...PRODUCT_CARD_SMALL} />;
+const CAROUSEL_PRODUCT_CARD_SMALL = (
+  <CarouselProductCard className="col-span-4" {...PRODUCT_CARD_SMALL} />
+);
 
 export default {
   default: <div className="container grid grid-cols-12">{CAROUSEL_PRODUCT_CARD}</div>,

package/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -1,18 +1,18 @@
 import type { CarouselProductCardContent, ListProps } from './CarouselProductCardContent';
 
+import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
+import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
-import { JSX } from '@redneckz/uni-jsx';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { List } from '../../ui-kit/List/List';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import type { Picture } from '../../model/Picture';
 import { Text } from '../../ui-kit/Text/Text';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
+import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
 import { alignTextStyle } from './alignTextStyle';
 
 export interface CarouselProductCardProps extends CarouselProductCardContent, UniBlockProps {}
@@ -39,12 +39,7 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
   }) => {
     return (
       <BlockWrapper
-        className={style(
-          'h-full flex flex-col justify-between min-w-[260px]',
-          'box-border border-solid border border-gray',
-          align,
-          className,
-        )}
+        className={style('flex flex-col justify-between', align, className)}
         defaultPadding="p-0"
         version={version}
         {...rest}

package/src/components/CarouselProgramsCard/CarouselProgramsCard.tsx

@@ -7,34 +7,27 @@ import { Img } from '../../ui-kit/Img/Img';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Text } from '../../ui-kit/Text/Text';
-import { style } from '../../utils/style';
 import type { CarouselProgramsCardContent } from './CarouselProgramsCardContent';
 import { cardDescriptionColor, cardTitleFont } from './programCardStyles';
 
 export interface CarouselTariffsCardProps extends CarouselProgramsCardContent, UniBlockProps {}
 
 export const CarouselProgramsCard = JSX<CarouselTariffsCardProps>(
-  ({ className = '', title, icon, list = [], href, target, ...rest }) => {
-    return (
-      <BlockWrapper
-        className={style('border border-gray', className)}
-        defaultPadding="p-3xl sm:p-0"
-        {...rest}
-      >
-        <LinkWrapper className="sm:flex sm:items-center" href={href} target={target}>
-          <div className="min-w-[200px] flex justify-center">
-            {icon?.src || icon?.icon ? <Img image={icon} /> : null}
-          </div>
-          <div className="sm:px-s p-5xl">
-            {title ? <Heading className="mb-xs sm:mb-m" headingType="h6" title={title} /> : null}
-            {list.length ? (
-              <div className="flex flex-col gap-xs sm:gap-s">{list?.map(renderList)}</div>
-            ) : null}
-          </div>
-        </LinkWrapper>
-      </BlockWrapper>
-    );
-  },
+  ({ className, title, icon, list = [], href, target, ...rest }) => (
+    <BlockWrapper className={className} defaultPadding="p-3xl sm:p-0" {...rest}>
+      <LinkWrapper className="sm:flex sm:items-center" href={href} target={target}>
+        <div className="flex justify-center px-xl">
+          {icon?.src || icon?.icon ? <Img image={icon} /> : null}
+        </div>
+        <div className="sm:px-s p-5xl">
+          {title ? <Heading className="mb-xs sm:mb-m" headingType="h6" title={title} /> : null}
+          {list.length ? (
+            <div className="flex flex-col gap-xs sm:gap-s">{list?.map(renderList)}</div>
+          ) : null}
+        </div>
+      </LinkWrapper>
+    </BlockWrapper>
+  ),
 );
 
 const renderList = (_: HeadlineCommonProps, i: number) => (

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.mobile.tsx

@@ -8,7 +8,6 @@ import { List } from '../../ui-kit/List/List';
 import { style } from '../../utils/style';
 import { SocialMedia } from '../Footer/SocialMedia';
 import { Headline } from '../Headline/Headline';
-import { BORDER_STYLE } from './cardStyle';
 import type { CarouselRecommendationCardContent } from './CarouselRecommendationCardContent';
 
 export interface RecommendationCardProps extends CarouselRecommendationCardContent, UniBlockProps {}
@@ -28,11 +27,7 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
   }) => {
     return (
       <BlockWrapper
-        className={style(
-          'relative box-border group-data-gray:bg-main-divider/50',
-          BORDER_STYLE,
-          className,
-        )}
+        className={style('relative group-data-gray:bg-main-divider/50', className)}
         defaultPadding="p-6xl"
         {...rest}
       >

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { Picture } from '../../model/Picture';
+import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
@@ -8,14 +8,14 @@ import { List } from '../../ui-kit/List/List';
 import { style } from '../../utils/style';
 import { SocialMedia } from '../Footer/SocialMedia';
 import { Headline } from '../Headline/Headline';
-import { BORDER_STYLE } from './cardStyle';
 import type { CarouselRecommendationCardContent } from './CarouselRecommendationCardContent';
 
 export interface RecommendationCardProps extends CarouselRecommendationCardContent, UniBlockProps {}
 
 export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
   ({
-    className = '',
+    className,
+    padding,
     description,
     href,
     icon,
@@ -24,43 +24,37 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
     target,
     title,
     align = 'text-left',
-    version = 'primary',
     ...rest
   }) => {
     return (
       <BlockWrapper
-        className={style(
-          'relative min-w-[524px] min-h-[218px] h-full box-border group-data-gray:bg-main-divider/50',
-          BORDER_STYLE,
-          className,
-        )}
-        defaultPadding="p-m"
-        version={version}
+        className={style('relative min-h-[218px] group-data-gray:bg-main-divider/50', className)}
+        defaultPadding="p-0"
         {...rest}
       >
         <LinkWrapper href={href} target={target}>
-          <Headline
-            className="mb-4"
-            title={title}
-            description={description}
-            headlineVersion="S"
-            isPadding={false}
-            align={align}
-          />
-          <div className="w-1/2 h-full flex flex-col flex-1 justify-end">
+          <BaseTile
+            className="h-full"
+            defaultPadding="p-m"
+            padding={padding}
+            title={
+              title ? (
+                <Headline
+                  title={title}
+                  description={description}
+                  headlineVersion="S"
+                  isPadding={false}
+                  align={align}
+                />
+              ) : null
+            }
+            backImage={icon?.icon || icon?.src ? <Img image={icon} /> : null}
+            buttons={socialMedia.length ? <SocialMedia media={socialMedia} /> : null}
+          >
             {items.length ? <List items={items} listItemSize="S" /> : null}
-            {socialMedia.length ? <SocialMedia className="pt-10" media={socialMedia} /> : null}
-          </div>
-          {renderIconBlock(icon)}
+          </BaseTile>
         </LinkWrapper>
       </BlockWrapper>
     );
   },
 );
-
-const renderIconBlock = (icon: Picture | undefined) => (
-  <div className="absolute bottom-0 right-0">
-    {icon?.icon ? <Img image={icon} /> : null}
-    {icon?.src ? <Img image={icon} /> : null}
-  </div>
-);

package/src/components/CarouselRichTextCard/CarouselRichTextCard.fixture.tsx

@@ -20,7 +20,7 @@ export const RICH_CARD: CarouselRichTextCardContent = {
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <CarouselRichTextCard {...RICH_CARD} />
+      <CarouselRichTextCard className="col-span-4" {...RICH_CARD} />
     </div>
   ),
 };

package/src/components/CarouselRichTextCard/CarouselRichTextCard.tsx

@@ -2,14 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { RichText } from '../../ui-kit/RichText/RichText';
-import { style } from '../../utils/style';
 import type { CarouselRichTextCardContent } from './CarouselRichTextCardContent';
 
 export interface CarouselRichTextCardProps extends CarouselRichTextCardContent, UniBlockProps {}
 
 export const CarouselRichTextCard = JSX<CarouselRichTextCardProps>(
   ({ className = '', __html, richVersion = 'striped', ...rest }) => (
-    <BlockWrapper className={style('border border-gray h-full min-w-96', className)} {...rest}>
+    <BlockWrapper className={className} {...rest}>
       <RichText __html={__html} richVersion={richVersion} />
     </BlockWrapper>
   ),

package/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -37,7 +37,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
 
     return (
       <BlockWrapper
-        className={style('relative border border-gray flex flex-col', className)}
+        className={style('relative flex flex-col', className)}
         defaultPadding={getPaddingStyle(isHighlighting)}
         {...rest}
       >
@@ -46,7 +46,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
         {title ? (
           <Heading className={style('pt-xs', align)} headingType="h5" title={title} />
         ) : null}
-        {button ? <Button className="w-full mt-4" {...button} /> : null}
+        {button ? <Button className="w-full mt-m" {...button} /> : null}
         {cardCells.length ? (
           <Foldable
             renderFoldableSection={({ isUnfolded }) => (
@@ -64,7 +64,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
 );
 
 const renderIconBlock = (icon?: Picture) => (
-  <div className="w-[267px] min-w-[267px] self-center">
+  <div className="basis-full self-center">
     {icon?.src || icon?.icon ? <Img image={icon} /> : null}
   </div>
 );

package/src/components/ComparisonTable/ComparisonTable.mobile.tsx

@@ -13,12 +13,12 @@ export const ComparisonTable = JSX<ComparisonTableProps>((props) => {
 
   return (
     <section
-      className={`bg-white font-sans px-4 py-6 overflow-hidden text-primary-text relative ${
+      className={`bg-white font-sans p-6xl overflow-hidden text-primary-text relative space-y-lg ${
         className || ''
       }`}
     >
       {title ? (
-        <Heading headingType="h3" className="font-medium text-center m-0 mb-5" title={title} />
+        <Heading headingType="h3" className="font-medium text-center" title={title} />
       ) : null}
       <div role="table">
         <TableInner {...props} />

package/src/components/ComparisonTable/ComparisonTable.tsx

@@ -57,7 +57,7 @@ const renderShowMoreToggleButton = ({
   isShowAllRow: boolean;
   onClick: () => void;
 }) => (
-  <div className="pr-12">
+  <div className="pr-6xl">
     <div className="flex w-full">
       <div className={FIRST_CELL_CLASSES} />
       <button

package/src/components/ComparisonTable/ComparisonTableBody.tsx

@@ -48,7 +48,7 @@ export const ComparisonTableBody = JSX<ComparisonTableBodyProps>(
           ) : null}
         </div>
         {isScrollAvailable ? (
-          <div className="absolute top-0 right-0 bottom-0 w-[84px] bg-opacity-to-white" />
+          <div className="absolute top-0 right-0 bottom-0 w-20 bg-opacity-to-white" />
         ) : null}
       </div>
     );

package/src/components/ComparisonTable/ComparisonTableRows.tsx

@@ -31,7 +31,7 @@ export const ComparisonTableRows = JSX<ComparisonTableRowsProps>(
         {isScrollAvailable
           ? renderArrows({
               ...controls,
-              btnClass: ['top-[108px]', 'top-[44px]'],
+              btnClass: ['top-28', 'top-12'],
               className: 'right-7',
               isDisabled: true,
             })

package/src/components/ComparisonTable/HeaderCell.tsx

@@ -16,18 +16,13 @@ export interface HeaderCellProps {
 
 export const HeaderCell = JSX<HeaderCellProps>(({ icon, image, title, link }) => (
   <div
-    className={`w-80 box-border flex flex-col items-center rounded-t-md border-b-0 px-7 pt-7 pb-[46px] ${BORDER_CLASSES} ${GRADIENT}`}
+    className={`w-80 box-border flex flex-col gap-m items-center rounded-t-md border-b-0 p-2xl ${BORDER_CLASSES} ${GRADIENT}`}
     role="columnheader"
   >
     {icon && !image?.src && (
-      <Img
-        className="h-[63px] w-[63px] min-w-[63px] min-h-[63px] mb-4"
-        image={icon}
-        width="63"
-        height="63"
-      />
+      <Img className="h-16 w-16 min-w-16 min-h-16" image={icon} width="64" height="64" />
     )}
-    {image?.src && <Img className="mb-[18px]" image={image} />}
+    {image?.src && <Img image={image} />}
     {title ? (
       <Heading headingType="h4" as="h3" className="text-center text-white" title={title} />
     ) : null}
@@ -36,9 +31,9 @@ export const HeaderCell = JSX<HeaderCellProps>(({ icon, image, title, link }) =>
         <Button
           href={link.href}
           target={link.target}
-          className="mt-4 w-full text-primary-main bg-white hover:bg-secondary-hover active:bg-secondary-active"
+          className="w-full text-primary-main bg-white hover:bg-secondary-hover active:bg-secondary-active"
         >
-          <div className="text-xs font-light font-medium py-[11px]">{link.text}</div>
+          <div className="text-xs font-light font-medium py-s">{link.text}</div>
         </Button>
       </div>
     )}

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -42,11 +42,11 @@ const renderBlocksColumn = ({ column, index }: RenderContactsColumnProps) =>
       {column.map(({ title = '', description, additionalDescription, button }, key) => (
         <div className="mt-xl first:mt-0" key={String(key)}>
           <Headline
-            className="!p-0"
             title={title}
             description={description}
             headlineVersion="XS"
             align="text-left"
+            isPadding={false}
           />
           {additionalDescription ? (
             <div className="mt-xs opacity-80">

package/src/components/ContentPage/ContentPage.tsx

@@ -1,14 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
+import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { useBool } from '../../hooks/useBool';
+import { useLocation } from '../../hooks/useLocation';
+import { useSWRResource } from '../../hooks/useSWRResource';
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
+import { projectSettings } from '../../ProjectSettings';
 import { useBlockRouterProvider } from '../../services/BlockRouter/useBlockRouterProvider';
+import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { CookiePopup } from '../../ui-kit/CookiePopup/CookiePopup';
 import { useDialogHandlers } from '../../ui-kit/Dialog/useDialogHandlers';
+import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
+import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
 import { style } from '../../utils/style';
 import { LikeControl } from '../LikeControl/LikeControl';
 
@@ -18,64 +25,75 @@ interface ContentPageProps extends UniBlockProps {
   blockDecorator?: BlockDecorator;
 }
 
-export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((props) => {
-  const { className = '', blocksRegistry, blockDecorator, data = {} } = props;
+export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>(
+  ({ className, blocksRegistry, blockDecorator, data = {} }) => {
+    const { style: pageStyle, slots, likeControl, colorPalette = 'pc' } = data;
 
-  const { style: pageStyle, blocks, slots, likeControl, colorPalette = 'pc' } = data;
+    const options: BlockRendererOptions = {
+      key: '',
+      page: data,
+      blocksRegistry,
+      blockDecorator,
+      parent: data,
+    };
 
-  const options: BlockRendererOptions = {
-    key: '',
-    page: data,
-    blocksRegistry,
-    blockDecorator,
-    parent: data,
-  };
+    const sitemap = useSWRResource<SitemapData>(
+      projectSettings.SITEMAP || 'sitemap',
+      data?.fallback,
+    );
+    const [location, onChangeLocation] = useLocation(sitemap?.defaultLocation);
 
-  useBlockRouterProvider();
+    useBlockRouterProvider();
+    const [isSomeDialogOpened, { setTrue: setSomeDialogOpened, setFalse: resetSomeDialogOpened }] =
+      useBool();
 
-  const [isSomeDialogOpened, { setTrue: setSomeDialogOpened, setFalse: resetSomeDialogOpened }] =
-    useBool();
+    useDialogHandlers({
+      onOpen: setSomeDialogOpened,
+      onClose: resetSomeDialogOpened,
+    });
 
-  useDialogHandlers({
-    onOpen: setSomeDialogOpened,
-    onClose: resetSomeDialogOpened,
-  });
-
-  return (
-    <section
-      className={style(
-        'relative',
-        pageStyle,
-        className,
-        isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
-      )}
-      data-theme={colorPalette}
-    >
-      {slots?.header ? (
-        <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">
-          {renderBlocksList(slots?.header, {
+    return (
+      <section
+        className={style(
+          'relative',
+          pageStyle,
+          className,
+          isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
+        )}
+        data-theme={colorPalette}
+      >
+        {slots?.header ? (
+          <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">
+            {renderBlocksList(slots?.header, {
+              ...options,
+              slotName: 'header',
+              extraProps: { sitemap, location },
+            })}
+          </div>
+        ) : null}
+        <div className="container grid grid-cols-12 gap-1">
+          {renderChildren({ block: data, options, extraProps: { className: 'scroll-mt-12' } })}
+          {renderBlocksList(slots?.footer, {
             ...options,
-            slotName: 'header',
+            slotName: 'footer',
+            extraProps: { sitemap, location },
           })}
         </div>
-      ) : null}
-      <div className="container grid grid-cols-12 gap-1">
-        {renderBlocksList(blocks, options)}
-        {slots?.footer
-          ? renderBlocksList(slots?.footer, {
-              ...options,
-              slotName: 'footer',
-            })
-          : null}
-      </div>
-      {likeControl ? renderLikeControl() : null}
-      <CookiePopup
-        termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
-        personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
-      />
-    </section>
-  );
-});
+        {likeControl ? renderLikeControl() : null}
+        <CookiePopup
+          termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
+          personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
+        />
+        <SearchDialog topItems={sitemap?.topItems} />
+        <LocationDialog
+          currentLocation={location}
+          foreignOffices={sitemap?.foreignOffices}
+          onChangeLocation={onChangeLocation}
+        />
+      </section>
+    );
+  },
+);
 
 ContentPage.childrenTypes = [];
 ContentPage.slots = () => ['header', 'footer'];

package/src/components/ExchangeRateTile/CurrencyTable.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Img } from '../../ui-kit/Img/Img';
+import { Text } from '../../ui-kit/Text/Text';
 import type { ExchangeCurrencyItem } from './ExchangeCurrencyCalculator';
 import { formatCurrency } from './formatCurrency';
 
 const TABLE_HEAD_STYLE = 'text-left text-m font-light text-secondary-text';
-const TABLE_HEAD_STYLE_WITH_PL = `${TABLE_HEAD_STYLE} pl-5xl`;
+const TABLE_HEAD_STYLE_WITH_PADDING = `${TABLE_HEAD_STYLE} pl-5xl`;
 
 const CURRENCY_ICONS_MAP = {
   USD: 'DollarIcon',
@@ -20,9 +21,15 @@ export const CurrencyTable = JSX<CurrencyTableProps>(({ className, exchangeCurre
   <table className={`h-fit w-fit ${className}`}>
     <thead>
       <tr>
-        <th className={TABLE_HEAD_STYLE}>Валюта</th>
-        <th className={TABLE_HEAD_STYLE_WITH_PL}>Купить</th>
-        <th className={TABLE_HEAD_STYLE_WITH_PL}>Продать</th>
+        <th className={TABLE_HEAD_STYLE}>
+          <Text size="text-m">Валюта</Text>
+        </th>
+        <th className={TABLE_HEAD_STYLE_WITH_PADDING}>
+          <Text size="text-m">Купить</Text>
+        </th>
+        <th className={TABLE_HEAD_STYLE_WITH_PADDING}>
+          <Text size="text-m">Продать</Text>
+        </th>
       </tr>
     </thead>
     <tbody>{exchangeCurrencyItems.map(renderCurrencyRow)}</tbody>
@@ -37,13 +44,22 @@ const renderCurrencyRow = (exchangeCurrencyItem: ExchangeCurrencyItem) => {
       <td className="pt-m">
         <div className="flex items-center">
           {currency ? (
-            <Img image={{ icon: CURRENCY_ICONS_MAP[currency] }} width="24" height="24" />
+            <Img
+              image={{ icon: CURRENCY_ICONS_MAP[currency] }}
+              width="24"
+              height="24"
+              className="mr-2"
+            />
           ) : null}
-          <span className="ml-xs">{currency}</span>
+          <Text size="text-h6">{currency}</Text>
         </div>
       </td>
-      <td className="pt-m pl-5xl">{formatCurrency(exchangeCurrencyItem?.saleExchangeRate)}</td>
-      <td className="pt-m pl-5xl">{formatCurrency(exchangeCurrencyItem?.buyExchangeRate)}</td>
+      <td className="pt-m pl-5xl">
+        <Text size="text-h6">{formatCurrency(exchangeCurrencyItem?.saleExchangeRate)}</Text>
+      </td>
+      <td className="pt-m pl-5xl">
+        <Text size="text-h6">{formatCurrency(exchangeCurrencyItem?.buyExchangeRate)}</Text>
+      </td>
     </tr>
   );
 };

package/src/components/ExchangeRateTile/CurrentLocation.tsx

@@ -1,14 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../../ui-kit/Img/Img';
+import { Picture } from '../../model/Picture';
+import { RoundedIcon } from '../../ui-kit/Icon/RoundedIcon';
 
 interface CurrentLocationProps {
   className?: string;
   address?: string;
 }
 
+const icon: Picture = { icon: 'GpsIcon' };
+
 export const CurrentLocation = JSX<CurrentLocationProps>(({ className = '', address }) => (
   <div className={`flex gap-s ${className}`}>
-    <Img image={{ icon: 'GpsIcon' }} width="24" height="24" />
+    <RoundedIcon {...icon} iconBgVersion="primary" />
     <div className="space-y-2xs">
       {address ? <p className="text-primary-main text-l">{address}</p> : null}
       <p className="text-secondary-text text-m">Курс указан для заданного офиса</p>

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -44,7 +44,7 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
     );
 
     return (
-      <div className={`grid gap-[18px] pt-2 ${className}`}>
+      <div className={`grid gap-m pt-2xl ${className}`}>
         {renderInput({
           placeholder: 'Хочу продать',
           rates: currencyRatesSell,

package/src/components/ExchangeRateTile/ExchangeRateTile.fixture.mobile.tsx

@@ -0,0 +1,19 @@
+import '../../setup-fixture';
+
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { ExchangeRateTile } from './ExchangeRateTile';
+
+const button: ButtonProps = {
+  href: 'https://coins.rshb.ru/exchange',
+  text: 'Купить валюту',
+  target: '_blank',
+  version: 'primary',
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <ExchangeRateTile button={button} className="col-span-12" />
+    </div>
+  ),
+};

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -31,7 +31,7 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
           className="h-full"
           title={<Heading headingType="h4" title={title} className="whitespace-pre-wrap" />}
         >
-          <div className="flex gap-6xl">
+          <div className="flex gap-6xl flex-wrap">
             <div>
               {currencyRates ? (
                 <CurrencyTable className="mb-xl" exchangeCurrencyItems={currencyRates} />