@redneckz/wildless-cms-uni-blocks 0.3.84 → 0.3.86

package/mobile/src/content-page-repository/transformPicture.ts

@@ -35,7 +35,8 @@ async function transformImg(
 ): Promise<string> {
   const { contentDir, publicDir, format, options, size } = transformationOptions;
 
-  const imgPath = `${path.dirname(pagePath)}/${src}`;
+  const pageDir = path.dirname(pagePath);
+  const imgPath = `${pageDir}/${src}`;
   let chain = sharp(imgPath);
   if (size) {
     chain = chain.resize(size?.width, size?.height, {
@@ -70,9 +71,10 @@ function transformSrc(src: string, { format, size }: TransformationOptions & Img
     return src;
   }
 
-  const suffix = [size?.width, size?.height].filter(Boolean).join('-');
+  const fileName = path.basename(src, path.extname(src));
+  const fileSizes = [size?.width, size?.height].filter(Boolean);
+  const suffix = fileSizes.length ? `-${fileSizes.join('-')}` : '';
+  const ext = String(format) || path.extname(src);
 
-  return `${path.basename(src, path.extname(src))}${suffix ? `-${suffix}` : ''}.${
-    String(format) || path.extname(src)
-  }`;
+  return `${fileName}${suffix}.${ext}`;
 }

package/mobile/src/hooks/useExchangeRates.ts

@@ -28,6 +28,8 @@ async function fetchExchangeRates(): Promise<any | undefined> {
     return await response.json();
   } catch (err) {
     console.error(err);
+
+    return Promise.resolve();
   }
 }
 
@@ -70,19 +72,16 @@ interface FormatRatesData {
 const getCurrencyListByRate = (currencyRates: RatesData[]) =>
   currencyRates.reduce((result: FormatRatesData[], _) => {
     const currencyInfo = _['currency_first'];
-    if (!validateRate(_['rate_buy']) && !validateRate(_['rate_sell'])) {
-      return result;
-    }
-    const currencyCode = currencyInfo.code;
+    const currencyCode = currencyInfo?.code;
     if (!result.some((i) => i.code === currencyCode)) {
       result.push({
         code: currencyCode,
-        buy: Number(_.rate_buy),
-        sell: Number(_.rate_sell),
+        buy: roundRate(Number(_.rate_buy)),
+        sell: roundRate(Number(_.rate_sell)),
       });
     }
 
     return result;
   }, []);
 
-const validateRate = (value) => Math.round(value) > 0;
+const roundRate = (value) => Math.round(value * 1000) / 1000;

package/mobile/src/hooks/useLink.ts

@@ -18,11 +18,11 @@ export function useLink(
     ...link,
     href,
     'aria-label': link.text,
-    onClick: handlerDecorator((ev: MouseEvent) => {
+    onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
       const isLocalHref = href && !isURL(href);
       const isLocalTarget = !link.target || link.target === '_self';
       if (isLocalHref && isLocalTarget) {
-        ev.preventDefault();
+        ev?.preventDefault();
         router.push(href);
       }
     }, link),

package/mobile/src/icons/IconName.ts

@@ -3,11 +3,11 @@
 /* eslint-disable max-lines */
 
 export enum IconMap {
-  ActualBalanceIcon = 'ActualBalanceIcon', AirPlane = 'AirPlane', AppleIcon = 'AppleIcon', ArrowDownIcon = 'ArrowDownIcon', ArrowLeftIcon = 'ArrowLeftIcon', ArrowUpIcon = 'ArrowUpIcon', AtmIcon = 'AtmIcon', BankIcon = 'BankIcon', BurgerIcon = 'BurgerIcon', Calendar2Icon = 'Calendar2Icon', CalendarCircleIcon = 'CalendarCircleIcon', CalendarIcon = 'CalendarIcon', CalendarTickIcon = 'CalendarTickIcon', CardIcon = 'CardIcon', CardPosIcon = 'CardPosIcon', CardTickIcon = 'CardTickIcon', CardWithGemIcon = 'CardWithGemIcon', CarIcon = 'CarIcon', ChartSquareIcon = 'ChartSquareIcon', CinemaIcon = 'CinemaIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CreditCardsIcon = 'CreditCardsIcon', DiscountShapeIcon = 'DiscountShapeIcon', DocIcon = 'DocIcon', DocIconMonoColor = 'DocIconMonoColor', DocsIcon = 'DocsIcon', DocumentTextIcon = 'DocumentTextIcon', DollarIcon = 'DollarIcon', DoneIcon = 'DoneIcon', EarthIcon = 'EarthIcon', EmptyWalletChangeIcon = 'EmptyWalletChangeIcon', EmptyWalletIcon = 'EmptyWalletIcon', EuroIcon = 'EuroIcon', GeolocationIcon = 'GeolocationIcon', GlassIcon = 'GlassIcon', GlobalIcon = 'GlobalIcon', GpsIcon = 'GpsIcon', GridIcon = 'GridIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', LoupeIcon = 'LoupeIcon', MasterCardIcon = 'MasterCardIcon', MinusIcon = 'MinusIcon', MirIcon = 'MirIcon', MoneyIcon = 'MoneyIcon', MoneyInsuranceIcon = 'MoneyInsuranceIcon', MonitorMobileIcon = 'MonitorMobileIcon', NewDocIcon = 'NewDocIcon', OfficeIcon = 'OfficeIcon', OkIcon = 'OkIcon', PassSendIcon = 'PassSendIcon', PercentageRoundIcon = 'PercentageRoundIcon', PercentageSquareIcon = 'PercentageSquareIcon', PersonalCardIcon = 'PersonalCardIcon', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', RoundRubleIcon = 'RoundRubleIcon', SafeIcon = 'SafeIcon', ShieldTickIcon = 'ShieldTickIcon', SignDocsIcon = 'SignDocsIcon', SmallClockIcon = 'SmallClockIcon', SoundIcon = 'SoundIcon', TelegramIcon = 'TelegramIcon', UnionPayIcon = 'UnionPayIcon', UserTickIcon = 'UserTickIcon', VisaIcon = 'VisaIcon', VKIcon = 'VKIcon', WalletAdd2Icon = 'WalletAdd2Icon', WalletAddIcon = 'WalletAddIcon', WalletIcon = 'WalletIcon', WalletWithMoneyIcon = 'WalletWithMoneyIcon', WateringCan = 'WateringCan'
+  ActualBalanceIcon = 'ActualBalanceIcon', AirPlane = 'AirPlane', AppleIcon = 'AppleIcon', ArrowDownIcon = 'ArrowDownIcon', ArrowLeftIcon = 'ArrowLeftIcon', ArrowUpIcon = 'ArrowUpIcon', AtmIcon = 'AtmIcon', BankIcon = 'BankIcon', BurgerIcon = 'BurgerIcon', Calendar2Icon = 'Calendar2Icon', CalendarCircleIcon = 'CalendarCircleIcon', CalendarIcon = 'CalendarIcon', CalendarTickIcon = 'CalendarTickIcon', CardIcon = 'CardIcon', CardPosIcon = 'CardPosIcon', CardTickIcon = 'CardTickIcon', CardWithGemIcon = 'CardWithGemIcon', CarIcon = 'CarIcon', ChartSquareIcon = 'ChartSquareIcon', CinemaIcon = 'CinemaIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CreditCardsIcon = 'CreditCardsIcon', DiscountShapeIcon = 'DiscountShapeIcon', DocIcon = 'DocIcon', DocIconMonoColor = 'DocIconMonoColor', DocsIcon = 'DocsIcon', DocumentTextIcon = 'DocumentTextIcon', DollarIcon = 'DollarIcon', DoneIcon = 'DoneIcon', EarthIcon = 'EarthIcon', EmptyWalletChangeIcon = 'EmptyWalletChangeIcon', EmptyWalletIcon = 'EmptyWalletIcon', EuroIcon = 'EuroIcon', GeolocationIcon = 'GeolocationIcon', GlassIcon = 'GlassIcon', GlobalIcon = 'GlobalIcon', GpsIcon = 'GpsIcon', GridIcon = 'GridIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', Logo = 'Logo', LoupeIcon = 'LoupeIcon', MasterCardIcon = 'MasterCardIcon', MinusIcon = 'MinusIcon', MirIcon = 'MirIcon', MoneyIcon = 'MoneyIcon', MoneyInsuranceIcon = 'MoneyInsuranceIcon', MonitorMobileIcon = 'MonitorMobileIcon', NewDocIcon = 'NewDocIcon', OfficeIcon = 'OfficeIcon', OkIcon = 'OkIcon', PassSendIcon = 'PassSendIcon', PercentageRoundIcon = 'PercentageRoundIcon', PercentageSquareIcon = 'PercentageSquareIcon', PersonalCardIcon = 'PersonalCardIcon', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', RoundRubleIcon = 'RoundRubleIcon', SafeIcon = 'SafeIcon', ShieldTickIcon = 'ShieldTickIcon', SignDocsIcon = 'SignDocsIcon', SmallClockIcon = 'SmallClockIcon', SoundIcon = 'SoundIcon', TelegramIcon = 'TelegramIcon', UnionPayIcon = 'UnionPayIcon', UserTickIcon = 'UserTickIcon', VisaIcon = 'VisaIcon', VKIcon = 'VKIcon', WalletAdd2Icon = 'WalletAdd2Icon', WalletAddIcon = 'WalletAddIcon', WalletIcon = 'WalletIcon', WalletWithMoneyIcon = 'WalletWithMoneyIcon', WateringCan = 'WateringCan'
 }
 
 export enum IconTitleMap {
-  ActualBalanceIcon = 'Деньги', AirPlane = 'Самолет', AppleIcon = 'Лого «Apple»', ArrowDownIcon = 'Стрелка \'Вниз\'', ArrowLeftIcon = 'Стрелка', ArrowUpIcon = 'Стрелка вверх', AtmIcon = 'Банкомат', BankIcon = 'Банк', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', CinemaIcon = 'Кино', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CreditCardsIcon = 'Кредитные карты', DiscountShapeIcon = 'Скидка', DocIcon = 'Документ', DocIconMonoColor = 'Документ (одноцветный)', DocsIcon = 'Документы', DocumentTextIcon = 'Документ с текстом', DollarIcon = 'Доллар', DoneIcon = 'Зелёная \'галочка\'', EarthIcon = 'Земля', EmptyWalletChangeIcon = 'Пустой кошелёк с возвратом', EmptyWalletIcon = 'Пустой кошелёк', EuroIcon = 'Евро', GeolocationIcon = 'Геолокация', GlassIcon = 'Зеркало', GlobalIcon = 'Глобус', GpsIcon = 'Gps', GridIcon = 'Сетка (белая)', InterestGrowthIcon = 'Диаграмма роста', InterestIcon = 'Скидка', JCBIcon = 'JCB', LoupeIcon = 'Лупа', MasterCardIcon = 'MasterCard', MinusIcon = 'Минус', MirIcon = 'МИР', MoneyIcon = 'Деньги', MoneyInsuranceIcon = 'Денежное страхование', MonitorMobileIcon = 'Монитор и мобильный', NewDocIcon = 'Новый документ', OfficeIcon = 'Офис', OkIcon = 'Лого «Одноклассники»', PassSendIcon = 'Бизнес', PercentageRoundIcon = 'Проценты (круг.)', PercentageSquareIcon = 'Проценты', PersonalCardIcon = 'Персональная карта', PlayMarketIcon = 'Лого «PlayMarket»', PlusIcon = 'Плюс', PowerIcon = 'Щит', Profile2UserIcon = 'Профиль, 2 персоны', ProfileIcon = 'Профиль', PumpkinIcon = 'Тыква', RoundRubleIcon = 'Рубль (круг.)', SafeIcon = 'Сейф', ShieldTickIcon = 'Безопасность', SignDocsIcon = 'Подписанные документы', SmallClockIcon = 'Маленькие часы', SoundIcon = 'Звук', TelegramIcon = 'Лого «Telegram»', UnionPayIcon = 'UnionPay', UserTickIcon = 'Пользователь', VisaIcon = 'Visa', VKIcon = 'Лого «VK»', WalletAdd2Icon = 'Пополнение карты', WalletAddIcon = 'Кошелёк с плюсом', WalletIcon = 'Кошелёк', WalletWithMoneyIcon = 'Кошелёк с деньгами', WateringCan = 'Добавить продукт'
+  ActualBalanceIcon = 'Деньги', AirPlane = 'Самолет', AppleIcon = 'Лого «Apple»', ArrowDownIcon = 'Стрелка \'Вниз\'', ArrowLeftIcon = 'Стрелка', ArrowUpIcon = 'Стрелка вверх', AtmIcon = 'Банкомат', BankIcon = 'Банк', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', CinemaIcon = 'Кино', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CreditCardsIcon = 'Кредитные карты', DiscountShapeIcon = 'Скидка', DocIcon = 'Документ', DocIconMonoColor = 'Документ (одноцветный)', DocsIcon = 'Документы', DocumentTextIcon = 'Документ с текстом', DollarIcon = 'Доллар', DoneIcon = 'Зелёная \'галочка\'', EarthIcon = 'Земля', EmptyWalletChangeIcon = 'Пустой кошелёк с возвратом', EmptyWalletIcon = 'Пустой кошелёк', EuroIcon = 'Евро', GeolocationIcon = 'Геолокация', GlassIcon = 'Зеркало', GlobalIcon = 'Глобус', GpsIcon = 'Gps', GridIcon = 'Сетка (белая)', InterestGrowthIcon = 'Диаграмма роста', InterestIcon = 'Скидка', JCBIcon = 'JCB', Logo = 'Logo', LoupeIcon = 'Лупа', MasterCardIcon = 'MasterCard', MinusIcon = 'Минус', MirIcon = 'МИР', MoneyIcon = 'Деньги', MoneyInsuranceIcon = 'Денежное страхование', MonitorMobileIcon = 'Монитор и мобильный', NewDocIcon = 'Новый документ', OfficeIcon = 'Офис', OkIcon = 'Лого «Одноклассники»', PassSendIcon = 'Бизнес', PercentageRoundIcon = 'Проценты (круг.)', PercentageSquareIcon = 'Проценты', PersonalCardIcon = 'Персональная карта', PlayMarketIcon = 'Лого «PlayMarket»', PlusIcon = 'Плюс', PowerIcon = 'Щит', Profile2UserIcon = 'Профиль, 2 персоны', ProfileIcon = 'Профиль', PumpkinIcon = 'Тыква', RoundRubleIcon = 'Рубль (круг.)', SafeIcon = 'Сейф', ShieldTickIcon = 'Безопасность', SignDocsIcon = 'Подписанные документы', SmallClockIcon = 'Маленькие часы', SoundIcon = 'Звук', TelegramIcon = 'Лого «Telegram»', UnionPayIcon = 'UnionPay', UserTickIcon = 'Пользователь', VisaIcon = 'Visa', VKIcon = 'Лого «VK»', WalletAdd2Icon = 'Пополнение карты', WalletAddIcon = 'Кошелёк с плюсом', WalletIcon = 'Кошелёк', WalletWithMoneyIcon = 'Кошелёк с деньгами', WateringCan = 'Добавить продукт'
 }
 
 /**
@@ -15,7 +15,7 @@ export enum IconTitleMap {
  * @title Иконка
  * @enumNames [
  *   "",
- *   'Деньги', 'Самолет', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка', 'Стрелка вверх', 'Банкомат', 'Банк', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Кино', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'Диаграмма роста', 'Скидка', 'JCB', 'Лупа', 'MasterCard', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'Персональная карта', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Лого «Telegram»', 'UnionPay', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт'
+ *   'Деньги', 'Самолет', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка', 'Стрелка вверх', 'Банкомат', 'Банк', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Кино', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'MasterCard', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'Персональная карта', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Лого «Telegram»', 'UnionPay', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт'
  * ]
  */
-export type IconName = '' | 'ActualBalanceIcon' | 'AirPlane' | 'AppleIcon' | 'ArrowDownIcon' | 'ArrowLeftIcon' | 'ArrowUpIcon' | 'AtmIcon' | 'BankIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'CinemaIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CreditCardsIcon' | 'DiscountShapeIcon' | 'DocIcon' | 'DocIconMonoColor' | 'DocsIcon' | 'DocumentTextIcon' | 'DollarIcon' | 'DoneIcon' | 'EarthIcon' | 'EmptyWalletChangeIcon' | 'EmptyWalletIcon' | 'EuroIcon' | 'GeolocationIcon' | 'GlassIcon' | 'GlobalIcon' | 'GpsIcon' | 'GridIcon' | 'InterestGrowthIcon' | 'InterestIcon' | 'JCBIcon' | 'LoupeIcon' | 'MasterCardIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PersonalCardIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'RoundRubleIcon' | 'SafeIcon' | 'ShieldTickIcon' | 'SignDocsIcon' | 'SmallClockIcon' | 'SoundIcon' | 'TelegramIcon' | 'UnionPayIcon' | 'UserTickIcon' | 'VisaIcon' | 'VKIcon' | 'WalletAdd2Icon' | 'WalletAddIcon' | 'WalletIcon' | 'WalletWithMoneyIcon' | 'WateringCan';
+export type IconName = '' | 'ActualBalanceIcon' | 'AirPlane' | 'AppleIcon' | 'ArrowDownIcon' | 'ArrowLeftIcon' | 'ArrowUpIcon' | 'AtmIcon' | 'BankIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'CinemaIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CreditCardsIcon' | 'DiscountShapeIcon' | 'DocIcon' | 'DocIconMonoColor' | 'DocsIcon' | 'DocumentTextIcon' | 'DollarIcon' | 'DoneIcon' | 'EarthIcon' | 'EmptyWalletChangeIcon' | 'EmptyWalletIcon' | 'EuroIcon' | 'GeolocationIcon' | 'GlassIcon' | 'GlobalIcon' | 'GpsIcon' | 'GridIcon' | 'InterestGrowthIcon' | 'InterestIcon' | 'JCBIcon' | 'Logo' | 'LoupeIcon' | 'MasterCardIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PersonalCardIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'RoundRubleIcon' | 'SafeIcon' | 'ShieldTickIcon' | 'SignDocsIcon' | 'SmallClockIcon' | 'SoundIcon' | 'TelegramIcon' | 'UnionPayIcon' | 'UserTickIcon' | 'VisaIcon' | 'VKIcon' | 'WalletAdd2Icon' | 'WalletAddIcon' | 'WalletIcon' | 'WalletWithMoneyIcon' | 'WateringCan';

package/mobile/src/icons/Logo.svg

@@ -0,0 +1,7 @@
+<svg title="Logo" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 45">
+  <path fill="currentColor" d="m13.72 25.51 4.42-4.33v-2.95l-4.42 4.32v2.96Zm0-10.98 4.42-4.35V7.41l-4.42 4.31v2.8Zm0 3.63 4.42-4.33v-2.78l-4.42 4.32v2.8ZM12.46 7.44l-.6-.56V0h-.66v6.22l-.58-.57V0h-.67v5l-.59-.58V0H8.7v6.56l4.44 4.33V0h-.67v7.44Zm1.26 14.35 4.42-4.33v-2.78L13.72 19v2.8Zm-5.03-.61 4.44 4.33v-2.96l-4.44-4.32v2.95Zm8.79-16.76-.59.58V0h-.66v5.66l-.6.56V0h-.66v6.87l-.58.57V0h-.67v10.9l4.42-4.34V0h-.66v4.42Zm-8.79 5.76 4.44 4.35v-2.8L8.69 7.4v2.77Zm0 3.65 4.44 4.33v-2.8l-4.44-4.3v2.77Zm0 3.63 4.44 4.33V19l-4.44-4.31v2.78Zm26.37 2.29H24.3a2.25 2.25 0 0 0 .36-1.22 2.32 2.32 0 0 0-2.33-2.31 2.32 2.32 0 0 0-2.31 2.31c0 .5.16.96.43 1.34a.74.74 0 0 0-.33.61c0 .26.14.49.33.62a2.32 2.32 0 0 0-.43 1.34 2.31 2.31 0 0 0 2.31 2.31 2.32 2.32 0 0 0 2.33-2.31c0-.45-.13-.87-.36-1.22h8.01v.49h-.8v.68h.8v.7h-.8v1.3h.8v-.58h1.17v.58h.79v-1.3h-.79v-.7h.79v-.68h-.79v-.5h1.58a.56.56 0 0 0 .56-.56v-.34a.57.57 0 0 0-.56-.56Zm-11.53 2.7a1.2 1.2 0 0 1-2.4 0c0-.24.08-.47.2-.66l.34-.56a.97.97 0 0 1-.34-.75c0-.3.13-.56.33-.74l-.32-.56a1.13 1.13 0 0 1-.2-.66 1.2 1.2 0 0 1 2.4 0c0 .49-.56 1.65-.56 1.65v.62c-.01.01.55 1.17.55 1.66ZM4.67 18.34v2.89c0 2.75 1.2 4.53 1.9 5.21l4.58 4.5c1.28 1.25 1.5 1.66 1.79 2.37v-3.2c0-2.84-1.44-3.94-2.19-4.67-1.73-1.68-2.89-2.8-3.82-3.73a8.98 8.98 0 0 1-2.26-3.37Zm6.08 14.24c-1.73-1.7-2.89-2.8-3.82-3.73a10 10 0 0 1-2.25-2.98v2.49a7.87 7.87 0 0 0 1.89 5.24l4.58 4.47c1.28 1.25 1.5 1.85 1.79 2.55v-3.37c0-2.85-1.45-3.95-2.19-4.67Z"/>,
+  <path fill="currentColor" d="M19.88 5.34c-.32 0-.64 0-.96.02V6.7a18.5 18.5 0 1 1 .95 36.94A18.5 18.5 0 0 1 1.35 25.17c0-5.67 2.55-10.73 6.58-14.13V9.32A19.78 19.78 0 0 0 0 25.17C0 36.12 8.9 45 19.88 45a19.85 19.85 0 0 0 19.86-19.83c0-10.95-8.9-19.83-19.87-19.83Z"/>,
+  <path fill="currentColor" d="M33.93 35.53c.3-.41.6-.85.87-1.3v-2.66h-.87v3.96Zm2.54-4.92c.12-.4.24-.78.34-1.16h-2.88v.7h.43c.77-.02 1.63-.03 2.11.46Zm-19.19-1.27h-.78v7.91h.78v-7.9Z"/>,
+  <path fill="currentColor" d="M14.7 27.83h2.58c.67 0 1.14.14 1.4.4.27.25.4.72.4 1.38v7.4c0 .66-.12 1.12-.4 1.38-.4.41-1.16.41-1.78.41l-.4-.01v3.5l.78.14v-2.88c1.2 0 1.97-.4 2.34-1.22v4.29h.26l.5-.01V29.74c0-.68.13-1.16.4-1.43.25-.27.72-.4 1.37-.4.67 0 1.65-.1 2.16.4.26.27.38.76.38 1.43v3.8h-1.77v-4.06h-.77v12.99c.26-.03.5-.07.77-.12V34.3h1.77v7.64c.36-.1.72-.21 1.08-.34v-7c0-.8.19-1.4 1-1.67l-.9-4.87h1.8l.3 5.31h.22l.3-5.31h1.88l-1.01 4.87c.84.3 1.01.81 1.01 1.66v4.53a16.63 16.63 0 0 0 1.5-1.27v-9.83h5.25l.1-.72H24.93l.17.89c-.38-.72-1.12-1.08-2.2-1.08h-.77c-1.3 0-2.1.52-2.4 1.55-.27-1.08-1.1-1.62-2.46-1.62h-3.36v14.52c.26.09.52.18.78.25V27.84Zm16.29 5.58-.85-.8.85-4.37v5.17Z"/>,
+  <path fill="currentColor" d="M27.66 40.79c.27-.14.55-.28.8-.43v-5.98h-.8v6.4Z"/>
+</svg>

package/mobile/src/model/HeadlineType.ts

@@ -0,0 +1,21 @@
+/**
+ * @title Размер заголовка
+ * @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький"]
+ */
+export type HeadlineVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S';
+
+export type TitleProp = {
+  /** @title Заголовок */
+  title?: string;
+};
+
+export type DescriptionProp = {
+  /** @title Описание */
+  description?: string;
+};
+
+export type HeadlineCommonProps = TitleProp & DescriptionProp;
+
+export type HeadlineProps = HeadlineCommonProps & {
+  headlineVersion?: HeadlineVersion;
+};

package/mobile/src/model/Picture.ts

@@ -1,6 +1,8 @@
 import type { IconName } from '../icons/IconName';
 import type { IconVersion } from './IconVersion';
 
+export type ImgFormats = 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
+
 export interface Img {
   /** @title Картинка */
   src?: string;
@@ -12,9 +14,9 @@ export interface Img {
 
 /**
  * @title Брейкпоинт
- * @enumNames ["1919px и меньше", "1439px и меньше", "1279px и меньше"]
+ * @enumNames ["Меньше 1920px", "Меньше 1440px", "Меньше 1280px"]
  */
-export type MediaQuery = '(max-width: 1919px)' | '(max-width: 1439px)' | '(max-width: 1279px)';
+export type MediaQuery = 1919 | 1439 | 1279;
 
 export interface ImgSource {
   /** @title Иконка */
@@ -23,7 +25,7 @@ export interface ImgSource {
   /** @title Картинка */
   src?: string;
   /** @title Формат */
-  format?: 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
+  format?: ImgFormats;
   /** @hidden */
   options?: Record<string, any>;
   media?: MediaQuery;

package/mobile/src/model/VNode.ts

@@ -1 +1 @@
-export type VNode = unknown;
+export type VNode = any;

package/mobile/src/services/sitemap/findActiveSubItem.ts

@@ -5,11 +5,10 @@ import { isSubItemActive } from './isSubItemActive';
 
 export const findActiveSubItem =
   (router: Router) =>
-  <T extends LinkProps>(items: T[] = []): T | null => {
+  <T extends LinkProps>(items: T[] = []): T | undefined => {
     const possibleActiveSubItems = items?.filter(isSubItemActive(router));
-    const activeSubItem = possibleActiveSubItems?.length
-      ? maxBy((_: T) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length
-      : null;
 
-    return activeSubItem;
+    return possibleActiveSubItems?.length
+      ? maxBy((_: T) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length
+      : undefined;
   };

package/mobile/src/types.ts

@@ -72,5 +72,3 @@ export interface DaDataSuggestion<T> {
 export interface DaDataAddress {
   city?: string | null;
 }
-
-export type FuncReturnVoid<Input = unknown> = (value: Input) => void;

package/mobile/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -17,12 +17,15 @@ export const renderBlocksList = ({ blocks, context, className = '' }: Embeddable
 const renderBlock =
   ({ context, className }: UniBlockProps) =>
   (block: BlockDef, i: number) => {
-    const type = block?.blockListType;
-    if (!type || !(type in EmbeddableBlocks)) {
+    if (!block) {
       return null;
     }
 
-    const { style, ...rest } = block;
+    const { style, blockListType: type, ...rest } = block;
+
+    if (!type || !(type in EmbeddableBlocks)) {
+      return null;
+    }
 
     const classNameBlock = style2className(style);
     const EmbeddedBlock: JSXBlock = EmbeddableBlocks[type];

package/mobile/src/ui-kit/Breadcrumb.tsx

@@ -3,7 +3,7 @@ import type { LinkProps } from '../model/LinkProps';
 
 export interface BreadcrumbProps extends LinkProps {
   className?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: () => void;
 }
 
 export const Breadcrumb = JSX<BreadcrumbProps>(

package/mobile/src/ui-kit/Button/Button.tsx

@@ -3,8 +3,8 @@
 
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { ButtonProps, ButtonWithIconProps } from './ButtonProps';
 import { ButtonInner } from './ButtonInner';
+import type { ButtonProps, ButtonWithIconProps } from './ButtonProps';
 
 const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
@@ -55,7 +55,7 @@ export const Button = JSX<ButtonCommonProps>(
           role="button"
           aria-disabled="true"
           aria-label={ariaLabel}
-          tabIndex="-1"
+          tabIndex={-1}
           className={`inline-block ${styleButton} ${buttonDisabledStyleMap[version] || ''} ${
             rounded ? 'rounded-full' : 'rounded-md'
           } ${className || ''}`}

package/mobile/src/ui-kit/Button/ButtonInner.tsx

@@ -14,8 +14,8 @@ export const ButtonInner = JSX<ButtonInnerProps>((props) => {
       {appendLeft ? appendLeft : null}
       {isWithText(props) ? (
         <div>
-          <div className="text-m-2xs font-light text-left">{aboveText}</div>
-          <div className="text-base text-left">{text}</div>
+          <div className="text-xs text-left">{aboveText}</div>
+          <div className={`text-left ${aboveText ? 'text-s -mt-0.5' : 'text-base'}`}>{text}</div>
         </div>
       ) : null}
       {appendRight ? appendRight : null}
@@ -30,7 +30,7 @@ const getButtonStyle = (props: ButtonInnerProps) => {
     return '';
   }
 
-  const withTextStyle = `px-9 gap-2 ${aboveText ? 'py-2' : 'py-4'}`;
+  const withTextStyle = `gap-2 ${aboveText ? 'py-2.5 px-7' : 'py-4 px-9'}`;
 
   return [
     'flex items-center justify-center',

package/mobile/src/ui-kit/Button/ButtonProps.ts

@@ -10,7 +10,7 @@ export interface ButtonAdditionalProps {
   disabled?: boolean;
   rel?: string;
   ariaLabel?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: (ev?: { preventDefault: () => void }) => void;
 }
 
 /**

package/mobile/src/ui-kit/Button/ButtonSection.tsx

@@ -11,7 +11,7 @@ export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '',
   const { handlerDecorator } = context;
   const router = context.useRouter();
 
-  return buttons?.length ? (
+  return buttons && buttons?.length ? (
     <div className={className}>
       {buttons.map((button, index) =>
         renderButton(useLink({ router, handlerDecorator }, button), index),
@@ -22,7 +22,7 @@ export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '',
 
 function renderButton({ icon, iconRight, ...button }: ButtonWithIconProps, i: number) {
   if (!button?.text) {
-    return;
+    return null;
   }
 
   return icon ? (

package/mobile/src/ui-kit/Button/LikeButton.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 
 export interface LikeButtonProps {
   className?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: () => void;
   ariaLabel?: string;
 }
 

package/mobile/src/ui-kit/Button/renderArrows.tsx

@@ -1,8 +1,7 @@
 import { ArrowButton } from './ArrowButton';
-import type { FuncReturnVoid } from '../../types';
 
-type renderArrowsProps = {
-  handler: FuncReturnVoid<MouseEvent>[];
+export type renderArrowsProps = {
+  handler: [() => void, () => void];
   isShown: [boolean, boolean];
   btnClass: [string, string];
   className?: string;

package/mobile/src/ui-kit/Checkbox/Checkbox.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { CheckboxProps } from './CheckboxProps';
 import { SVG } from '../SVG';
+import type { CheckboxProps } from './CheckboxProps';
 
 const CHECK_PATHS = [
   {
@@ -11,27 +11,32 @@ const CHECK_PATHS = [
   },
 ];
 
-export const Checkbox = JSX<CheckboxProps>(({ text, checked, onChange, className }) => (
+export const Checkbox = JSX<CheckboxProps>(({ className, text, checked, isRadio, onChange }) => (
   <div className={className}>
     <label className="flex items-center cursor-pointer relative">
       <input
-        className={`peer appearance-none w-5 h-5 border-solid border ${
-          checked ? 'border-black' : 'border-main-stroke'
-        } rounded checked:bg-primary-main checked:border-primary-main m-0`}
+        className={`peer appearance-none w-5 h-5 border-solid
+        ${isRadio ? 'rounded-full border-2' : 'rounded checked:bg-primary-main border'}
+        ${checked ? 'border-black' : 'border-main-stroke'}
+        checked:border-primary-main m-0`}
         type="checkbox"
         onChange={(e) => {
           onChange(e.target.checked);
         }}
         checked={checked}
       />
-      <SVG
-        paths={CHECK_PATHS}
-        className="hidden absolute left-1 ml-px peer-checked:block"
-        width="11"
-        height="9"
-        fill="white"
-        viewBox="0 0 11 9"
-      />
+      {isRadio ? (
+        <div className="left-1 w-3 h-3 rounded-full bg-primary-main hidden absolute peer-checked:block"></div>
+      ) : (
+        <SVG
+          paths={CHECK_PATHS}
+          className="hidden absolute left-1 ml-px peer-checked:block"
+          width="11"
+          height="9"
+          fill="white"
+          viewBox="0 0 11 9"
+        />
+      )}
       {text ? <span className="font-sans ml-3 text-m-base cursor-pointer">{text}</span> : null}
     </label>
   </div>

package/mobile/src/ui-kit/Checkbox/CheckboxProps.ts

@@ -1,6 +1,7 @@
 export interface CheckboxProps {
   text?: string;
   checked: boolean;
-  onChange: (value: boolean) => void;
   className?: string;
+  isRadio?: boolean;
+  onChange: (value: boolean) => void;
 }

package/mobile/src/ui-kit/Description/Description.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { DescriptionContent } from './DescriptionContent';
+import type { DescriptionProp } from '../../model/HeadlineType';
 
-export interface DescriptionProps extends DescriptionContent {
+export interface DescriptionProps extends DescriptionProp {
   className?: string;
 }
 
 export const Description = JSX<DescriptionProps>((props) => {
   const { className = '', description } = props;
 
-  return <div className={`font-normal text-base ${className}`}>{description}</div>;
+  return <div className={`${className}`}>{description}</div>;
 });

package/mobile/src/ui-kit/Foldable/Foldable.tsx

@@ -46,19 +46,21 @@ export const Foldable = JSX<FoldableProps>(
       initialState: isUnfolded,
     });
 
+    const buttonClassName =
+      foldButtonClasses ||
+      'border-none bg-primary-main px-0 py-[26px] mb-[1px] w-full font-sans text-white text-base flex justify-center cursor-pointer';
+    const getFoldButtonLabel = isActive ? 'Скрыть' : foldButtonLabel;
+
     return blocks ? (
       <div>
         {renderBlocks(blocks, render, { blocksToHide, isActive, containerClasses })}
         {hiddenBlocksNum ? (
           <button
-            className={
-              foldButtonClasses ||
-              'border-none bg-primary-main px-0 py-[26px] mb-[1px] w-full font-sans text-white text-base flex justify-center cursor-pointer'
-            }
+            className={buttonClassName}
             data-theme={foldButtonDataTheme}
             onClick={handleToggle}
           >
-            <span className="pr-3">{isActive ? 'Скрыть' : foldButtonLabel}</span>
+            <span className="pr-3">{getFoldButtonLabel}</span>
             {icon ? <Icon name={icon} iconVersion="white" width="20" height="20" asSVG /> : null}
           </button>
         ) : null}

package/mobile/src/ui-kit/Foldable/useActiveHandler.ts

@@ -12,7 +12,7 @@ export const useActiveHandler = ({ context, initialState = false }: ActiveHandle
   const [isActive, setIsActive] = context.useState(initialState);
   const icon: IconName = isActive ? 'ArrowUpIcon' : 'ArrowDownIcon';
 
-  const handleToggle = (e: MouseEvent) => {
+  const handleToggle = (e) => {
     const currentTarget = e.currentTarget as HTMLElement;
 
     if (!currentTarget) {

package/mobile/src/ui-kit/HeaderItem/HeaderItem.tsx

@@ -8,12 +8,10 @@ const TEXT_CLASSES = 'font-sans font-normal text-sm';
 const BORDER_CLASSES = 'absolute left-0 -bottom-3 w-full h-[2px]';
 
 export const HeaderItem = JSX<HeaderItemProps>(
-  ({ className, text, href, target, active, onClick, children, bgColor = 'bg-white' }) => {
+  ({ className = '', text, href, target, active, onClick, children, bgColor = 'bg-white' }) => {
     return (
       <a
-        className={`relative inline-block bg-transparent text-center no-underline ${
-          className || ''
-        }`}
+        className={`relative inline-block bg-transparent text-center no-underline ${className}`}
         href={href}
         target={target}
         onClick={onClick}
@@ -25,7 +23,7 @@ export const HeaderItem = JSX<HeaderItemProps>(
   },
 );
 
-const getTextClasses = (bgColor: BgColorVersion, active?: boolean) => {
+const getTextClasses = (bgColor: BgColorVersion, active = false) => {
   let classes = 'text-white';
   if (bgColor === 'bg-white') {
     classes = active ? 'text-primary-main' : 'text-secondary-text hover:text-primary-main';
@@ -34,7 +32,7 @@ const getTextClasses = (bgColor: BgColorVersion, active?: boolean) => {
   return `${classes} ${TEXT_CLASSES}`;
 };
 
-const getBorderClasses = (bgColor: BgColorVersion, active?: boolean) => {
+const getBorderClasses = (bgColor: BgColorVersion, active = false) => {
   if (!active) {
     return BORDER_CLASSES;
   }

package/mobile/src/ui-kit/Heading/Heading.tsx

@@ -1,12 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { HeadingContent, HeadingType, HeadingTypeContent } from './HeadingContent';
-
-export interface HeadingProps extends HeadingContent, HeadingTypeContent {
-  className?: string;
-  as?: HeadingType;
-}
+import type { HeadingProps, HeadingType } from './HeadingProps';
 
 const HeadingClass: Record<HeadingType, string> = {
+  h0: 'text-m-title',
   h1: 'text-m-title',
   h2: 'text-m-title',
   h3: 'text-m-title-md',
@@ -16,13 +12,7 @@ const HeadingClass: Record<HeadingType, string> = {
 };
 
 export const Heading = JSX<HeadingProps>((props) => {
-  const { className, headingType, title, as } = props;
-
-  if (!headingType) {
-    return;
-  }
-
-  const Tag = as || headingType;
+  const { className, headingType = 'h3', title, as: Tag = 'h3' } = props;
 
   return (
     <Tag className={`font-sans font-medium m-0 ${HeadingClass[headingType]} ${className || ''}`}>

package/mobile/src/ui-kit/Heading/HeadingProps.ts

@@ -0,0 +1,24 @@
+import type { TitleProp } from '../../model/HeadlineType';
+
+/**
+ *
+ * @title Размер заголовка
+ * @enumNames [
+ *   "h0", "h1", "h2", "h3", "h4", "h5", "h6"
+ * ]
+ */
+export type HeadingType = 'h0' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+/**
+ * @hidden
+ */
+export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+export interface HeadingCommonProps extends TitleProp {
+  as?: HeadingTagType;
+  headingType?: HeadingType;
+}
+
+export interface HeadingProps extends HeadingCommonProps {
+  className?: string;
+}