@redneckz/wildless-cms-uni-blocks 0.6.23 → 0.6.24

package/mobile/src/components/Header/HeaderSubMenuItem.tsx

@@ -0,0 +1,61 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useIntersectionObserver } from '../../hooks/useIntersectionObserver';
+import { useLink } from '../../hooks/useLink';
+import type { BgColorVersion } from '../../model/BgColorVersion';
+import type { LinkProps } from '../../model/LinkProps';
+import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+
+export interface HeaderSubMenuItemProps extends LinkProps {
+  context: ContentPageContext;
+  className?: string;
+  active?: boolean;
+  bgColor?: BgColorVersion;
+  observerOptions?: IntersectionObserverInit;
+  onVisibilityChange?: (isIntersecting: boolean) => void;
+}
+
+export const HeaderSubMenuItem = JSX<HeaderSubMenuItemProps>(
+  ({
+    context,
+    className,
+    active,
+    bgColor,
+    observerOptions,
+    onVisibilityChange,
+    children,
+    ...linkProps
+  }) => {
+    const { handlerDecorator } = context;
+    const router = context.useRouter();
+
+    const observerCallback = useCallback(
+      (entries: IntersectionObserverEntry[]) => {
+        if (!entries.length || !onVisibilityChange) {
+          return;
+        }
+
+        // Assumption about entries order (by time)
+        const entry = entries[entries.length - 1];
+
+        onVisibilityChange(entry.isIntersecting);
+      },
+      [onVisibilityChange],
+    );
+    const ref = useIntersectionObserver<HTMLSpanElement>(observerCallback, observerOptions);
+
+    return (
+      <span ref={ref}>
+        <HeaderItem
+          className={className}
+          active={active}
+          bgColor={bgColor}
+          {...useLink({ router, handlerDecorator }, linkProps)}
+        >
+          {children}
+        </HeaderItem>
+      </span>
+    );
+  },
+);

package/mobile/src/components/LinkDocs/LinkDocsListItemBase.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { Img } from '../../ui-kit/Img/Img';
 import type { LinkDocsItem } from './LinkDocsContent';
 import type { Picture } from '../../model/Picture';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface LinkDocsListItemProps {
   className?: string;
@@ -22,7 +23,13 @@ export const LinkDocsListItemBase = JSX<LinkDocsListItemBaseProps>(
     return (
       <a className={className} role="link" {...linkProps}>
         {icon ? (
-          <Img className={iconClassName} image={icon} width="24px" height="24px" asSVG />
+          <Img
+            className={iconClassName}
+            image={getIconWithVersion(icon)}
+            width="24px"
+            height="24px"
+            asSVG
+          />
         ) : null}
         {text ? (
           <span className={textClassName}>

package/mobile/src/components/MobileAppTile/MobileAppTile.tsx

@@ -15,7 +15,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
         {href ? (
           <div className="flex">
             <div className="flex justify-center align-middle rounded-md bg-primary-main w-[50px] h-[50px]">
-              <Logo className="w-[33px]" bgColor="transparent" showTitle />
+              <Logo className="w-8" bgColor="transparent" showTitle />
             </div>
             <a href={href} target="_blank" className="flex flex-col justify-center pl-3">
               <div className="text-s font-medium mb-[3px]">{title}</div>

package/mobile/src/components/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -7,6 +7,7 @@ import type {
   OfficeServicesBlockContent,
   OfficeServicesBlockList,
 } from './OfficeServicesBlockContent';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface OfficeServicesBlockProps extends OfficeServicesBlockContent, UniBlockProps {}
 
@@ -36,7 +37,7 @@ const renderListItems = (itemList: OfficeServicesBlockList, i: number) => (
         width="24"
         height="24"
         asSVG
-        image={itemList.icon}
+        image={getIconWithVersion(itemList.icon)}
       />
     ) : null}
     {itemList.label ? <span className="text-l-light">{itemList.label}</span> : null}

package/mobile/src/components/ProductBlock/renderBenefit.tsx

@@ -5,8 +5,8 @@ import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
 
 export const renderBenefit =
   (version: BlockVersion = 'primary', benefitsVersion: IconVersion = 'normal') =>
-  ({ icon, label, description }: BenefitItemProps, i: number) => {
-    return (
+  ({ icon, label, description }: BenefitItemProps, i: number) =>
+    (
       <BenefitItem
         key={String(i)}
         icon={icon}
@@ -16,4 +16,3 @@ export const renderBenefit =
         benefitsVersion={benefitsVersion}
       />
     );
-  };

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -8,6 +8,7 @@ import { Img } from '../../ui-kit/Img/Img';
 import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
 import type { Step, StepsBlockContent } from './StepsBlockContent';
 import { STEPS_BLOCK_STYLE_MAPS } from './StepsBlockStyleMaps';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -112,7 +113,7 @@ const renderIconArea = (size: SizeVersion, version: BlockVersion) => (step: Step
       <span className={`font-medium flex self-center ${styleMap.title} ${iconTextSize}`}>
         {checkIsIconRenderable(step?.icon) ? (
           <Img
-            image={{ ...step.icon, iconVersion: STEPS_SVG_VERSION_MAP[version] }}
+            image={getIconWithVersion({ ...step.icon }, version)}
             width={iconSize}
             height={iconSize}
             asSVG

package/mobile/src/components/TariffsTable/EmbeddableCellData.tsx

@@ -19,11 +19,11 @@ const renderButtonsCellData = ({ buttons }: ButtonContent) =>
         renderButton({
           button: { rounded, icon, ...buttonProps },
           buttonClassName: `mt-3 ${idx > 0 && rounded ? 'ml-2.5' : ''} ${icon ? 'w-12 h-12' : ''}`,
+          index: idx,
         }),
       )}
     </div>
   ) : null;
-
 const renderLabelDescriptionCellData = ({ label, description }: LabelDescriptionCell) => {
   const labelClassName = `text-xl font-medium m-0 ${description ? 'mb-1' : ''}`;
 

package/mobile/src/components/TariffsTable/TariffsTableRow.tsx

@@ -8,6 +8,7 @@ import { COLUMN_WIDTH, DIVIDER_CLASSES, FIRST_CELL_CLASSES } from './constants';
 import { TariffsTableCell } from './TariffsTableCell';
 import type { Data } from './TariffsTableContent';
 import { TariffsTableRowContainer } from './TariffsTableRowContainer';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface TariffsTableRowProps extends UniBlockProps {
   row: Data;
@@ -33,7 +34,7 @@ export const TariffsTableRow = JSX<TariffsTableRowProps>(
             {header?.icon ? (
               <Img
                 className="mr-[14px] max-w-6 max-h-6"
-                image={header.icon}
+                image={getIconWithVersion(header.icon)}
                 width="24px"
                 height="24px"
                 asSVG

package/mobile/src/hooks/useIntersectionObserver.ts

@@ -0,0 +1,23 @@
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+
+export function useIntersectionObserver<R extends Element>(
+  observerCallback: IntersectionObserverCallback,
+  observerOptions?: IntersectionObserverInit,
+) {
+  const ref = useRef<R | null>(null);
+
+  useEffect(() => {
+    if (!ref.current) {
+      return undefined;
+    }
+
+    const intersectionObserver = new IntersectionObserver(observerCallback, observerOptions);
+    intersectionObserver.observe(ref.current);
+
+    return () => {
+      intersectionObserver.disconnect();
+    };
+  }, [observerCallback, observerOptions]);
+
+  return ref;
+}

package/mobile/src/hooks/useOutsideClick.ts

@@ -1,25 +1,25 @@
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 
-interface Ref {
-  current: HTMLInputElement | null;
-}
+export function useOutsideClick<R extends Node>(onClick: () => void) {
+  const targetRef = useRef<R | null>(null);
 
-export function useOutsideClick(wrapperRef: Ref, setIsOpen: (_: boolean) => void) {
   useEffect(() => {
-    function handleClickOutside(event: MouseEvent) {
+    const handleClickOutside = (event: { target?: any }) => {
       if (
-        wrapperRef &&
-        wrapperRef.current &&
-        event.target instanceof HTMLElement &&
-        !wrapperRef.current.contains(event.target)
+        targetRef &&
+        targetRef.current &&
+        event.target instanceof Node &&
+        !targetRef.current.contains(event.target)
       ) {
-        setIsOpen(false);
+        onClick();
       }
-    }
+    };
     document.addEventListener('click', handleClickOutside);
 
     return () => {
       document.removeEventListener('click', handleClickOutside);
     };
-  }, []);
+  }, [onClick]);
+
+  return targetRef;
 }

package/mobile/src/index.ts

@@ -7,4 +7,4 @@ export { ContentPage } from './components/ContentPage/ContentPage';
 export { projectSettings } from './ProjectSettings';
 export { joinList } from './utils/joinList';
 export * as url from './utils/url';
-export const packageVersion = process?.env?.UNI_BLOCKS_VERSION;
+export const packageVersion = globalThis.process?.env?.UNI_BLOCKS_VERSION;

package/mobile/src/model/IconVersion.ts

@@ -1,9 +1,12 @@
 /**
  * @title Цвет иконки
+ * @default normal
  * @enumNames [
- *    "Нормальный",
+ *    "по умолчанию",
+ *    "Цветной",
  *    "Белый",
  *    "Чёрный"
  * ]
  */
-export type IconVersion = 'normal' | 'white' | 'black';
+
+export type IconVersion = 'normal' | 'color' | 'white' | 'black';

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

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
-import type { Picture } from '../../model/Picture';
 import { Img } from '../Img/Img';
 import type { BenefitItemCommonProps, BenefitItemProps } from './BenefitItemProps';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
 
@@ -25,16 +25,14 @@ export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
     version = 'primary',
     benefitsVersion = 'normal',
   } = props;
-
-  const isIconWhite = benefitsVersion === 'white' || version === 'secondary';
   const listItemAlign = description ? 'items-start' : 'items-center';
-  const iconVersion = getIconVersion(isIconWhite, icon);
+  const calcVersion = benefitsVersion === 'white' ? 'secondary' : 'primary';
 
   return (
     <div className={`flex gap-5 ${listItemAlign} ${className}`}>
       {icon ? (
         <div className={renderBenefitIconBgStyle(version, benefitsVersion)}>
-          <Img className="w-6 h-6" image={{ ...icon, iconVersion }} asSVG />
+          <Img className="w-6 h-6" image={getIconWithVersion(icon, calcVersion)} asSVG />
         </div>
       ) : null}
       <div className="gap-0.5">
@@ -58,6 +56,3 @@ function renderBenefitIconBgStyle(version: BlockVersion, benefitsVersion: IconVe
 
   return `w-[50px] h-[50px] min-w-[50px] rounded-full p-2.5 box-border flex items-center justify-center ${bgColorStyle}`;
 }
-
-const getIconVersion = (isIconWhite: boolean, icon?: Picture) =>
-  icon?.iconVersion || isIconWhite ? 'white' : 'normal';

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

@@ -2,9 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { AnchorClickScrollingEvent } from '../components/Tabs/Tabs';
 import { EventBus } from '../EventBus/EventBus';
+import { useIntersectionObserver } from '../hooks/useIntersectionObserver';
 import type { UniBlockProps } from '../model/JSXBlock';
 import { changeHashOnObserve } from '../utils/changeHashOnObserve';
-import { IntersectionObserverTag } from './IntersectionObserverTag';
 
 interface BlockWrapperProps extends UniBlockProps, Record<string, any> {
   anchor?: string;
@@ -24,57 +24,42 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
   ({ anchor, className, children, tag = 'section', labels, role }) => {
     const Tag: any = tag;
 
-    const [shouldRenderBlock, setShouldRenderBlock] = useState(true);
+    const [isVisible, setVisible] = useState(true);
     const anchorClickRef = useRef<AnchorClickScrollingEvent>({});
 
     const observerCallback = useMemo(
       () => changeHashOnObserve({ anchor, anchorClickRef }),
       [anchor],
     );
+    const ref = useIntersectionObserver(observerCallback, OBSERVER_OPTIONS);
 
-    useEffect(() => {
-      const anchorClickCleanup = EventBus.inst.subscribe('anchorClick', (e) => {
-        setShouldRenderBlock(true);
-        anchorClickRef.current = e;
-      });
-      const tabCleanup = EventBus.inst.subscribe('tab', (event) => {
-        if (event.type === 'group') {
-          const blockHasSettgins = labels?.length || anchor;
-          setShouldRenderBlock(
-            event.label ? !blockHasSettgins || Boolean(labels?.includes(event.label)) : true,
-          );
-        } else {
-          changeHash(event.label);
-          setShouldRenderBlock(true);
-        }
-      });
-
-      return () => {
-        anchorClickCleanup();
-        tabCleanup();
-      };
-    }, []);
-
-    if (!shouldRenderBlock) {
-      return null;
-    }
+    useEffect(
+      () =>
+        EventBus.inst.subscribe('anchorClick', (e) => {
+          setVisible(true);
+          anchorClickRef.current = e;
+        }),
+      [],
+    );
+    useEffect(
+      () =>
+        EventBus.inst.subscribe('tab', (event) => {
+          if (event.type === 'group') {
+            const hasSettings = labels?.length || anchor;
+            setVisible(event.label ? !hasSettings || Boolean(labels?.includes(event.label)) : true);
+          } else {
+            changeHash(event.label);
+            setVisible(true);
+          }
+        }),
+      [],
+    );
 
-    return anchor ? (
-      <IntersectionObserverTag
-        tag={tag}
-        className={className}
-        observerCallback={observerCallback}
-        observerOptions={OBSERVER_OPTIONS}
-        anchor={anchor}
-        role={role}
-      >
-        {children}
-      </IntersectionObserverTag>
-    ) : (
-      <Tag className={className} role={role}>
+    return isVisible ? (
+      <Tag className={className} role={role} {...(anchor ? { id: anchor, ref } : {})}>
         {children}
       </Tag>
-    );
+    ) : null;
   },
 );
 

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

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { IconVersion } from '../../model/IconVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { Img } from '../Img/Img';
@@ -14,12 +13,6 @@ interface RenderButtonProps {
   buttonClassName?: string;
   index?: number;
 }
-
-interface RenderButtonIconProps {
-  icon?: Picture;
-  iconVersion?: IconVersion;
-}
-
 export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '', buttons }) => {
   const { handlerDecorator } = context;
   const router = context.useRouter();
@@ -36,10 +29,10 @@ export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '',
 export function renderButton({ button, buttonClassName, index }: RenderButtonProps) {
   const { icon, iconRight, version, ...rest } = button;
 
-  const iconVersion = version === 'secondary' ? 'normal' : 'white';
+  const iconVersion = version === 'secondary' ? 'color' : 'white';
 
-  const leftIcon = renderButtonIcon({ icon, iconVersion });
-  const rightIcon = renderButtonIcon({ icon: iconRight, iconVersion });
+  const leftIcon = renderButtonIcon({ ...icon, iconVersion: iconVersion } as Picture);
+  const rightIcon = renderButtonIcon({ ...iconRight, iconVersion: iconVersion } as Picture);
 
   return (
     <Button
@@ -53,11 +46,11 @@ export function renderButton({ button, buttonClassName, index }: RenderButtonPro
   );
 }
 
-const renderButtonIcon = ({ icon, iconVersion }: RenderButtonIconProps) => {
+const renderButtonIcon = (icon: Picture) => {
   if (!icon?.icon && !icon?.src) {
     return null;
   }
   const iconWidth = icon?.size?.width ? `${icon.size.width}` : '24';
 
-  return <Img image={{ ...icon, iconVersion: iconVersion }} width={iconWidth} height="24" asSVG />;
+  return <Img image={{ ...icon }} width={iconWidth} height="24" asSVG />;
 };

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

@@ -4,7 +4,8 @@ import { projectSettings } from '../../ProjectSettings';
 import type { IconProps } from './IconProps';
 
 const svgUseStyleMap: Record<IconVersion, string> = {
-  normal: 'text-primary-main',
+  normal: '',
+  color: 'text-primary-main',
   black: 'text-black',
   white: 'text-black',
 };
@@ -16,13 +17,13 @@ export const Icon = JSX<IconProps>(
     name = '',
     alt = `Иконка ${name}`,
     title = alt,
-    iconVersion = 'normal',
+    iconVersion = 'color',
     asSVG,
     ...imgProps
   }) => {
     const href = `${projectSettings.CDN || ''}icons/${name}.svg`;
 
-    if (asSVG) {
+    if (asSVG && iconVersion !== 'normal') {
       return (
         <Background className={className}>
           <svg

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

@@ -10,10 +10,16 @@ export interface LogoProps {
   showTitle?: boolean;
 }
 
+const ICON_VERSION_MAP: Record<BgColorVersion, string> = {
+  'bg-white': 'color',
+  transparent: 'white',
+};
+
 const SVG_COLOR: Record<BgColorVersion, string> = {
   'bg-white': 'text-primary-main',
   transparent: 'text-white',
 };
+
 const TEXT_COLOR: Record<BgColorVersion, string> = {
   'bg-white': 'text-black',
   transparent: 'text-white',
@@ -29,8 +35,10 @@ export const Logo = JSX<Partial<LogoProps>>(
         aria-label="Россельхозбанк"
       >
         <Img
-          image={{ icon: 'LogoIcon', iconVersion: SVG_COLOR[bgColor] }}
-          className={`${SVG_COLOR[bgColor]} w-10 h-[38px]`}
+          image={{ icon: 'LogoIcon', iconVersion: ICON_VERSION_MAP[bgColor] }}
+          className={`${SVG_COLOR[bgColor]}`}
+          width="34"
+          height="34"
           asSVG
         />
         {showTitle ? (

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '../../hooks/useOutsideClick';
 import { Icon } from '../Icon/Icon';
 
@@ -23,9 +23,8 @@ export const Select = JSX<SelectProps>(
     const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
     const [isOpen, setIsOpen] = useState(false);
 
-    const wrapperRef = useRef<HTMLInputElement | null>(null);
-
-    useOutsideClick(wrapperRef, setIsOpen);
+    const handleClickOutside = useCallback(() => setIsOpen(false), []);
+    const wrapperRef = useOutsideClick<HTMLDivElement>(handleClickOutside);
 
     const choiceOption = (option: OptionProps) => {
       setSelectedItem(option);

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

@@ -10,9 +10,9 @@ export interface TopItemProps extends TopItemContent {
   className?: string;
   flat?: boolean;
   ariaLabel?: string;
-  onClick?: () => void;
   bgColor?: BgColorVersion;
   dataItemName?: string;
+  onClick?: () => void;
 }
 
 const TEXT_CLASSES = 'font-sans text-s-light';

package/mobile/src/utils/getIconWithVersion.ts

@@ -0,0 +1,7 @@
+import type { Picture } from '../model/Picture';
+import type { BlockVersion } from '../model/BlockVersion';
+
+export const getIconWithVersion = (icon: Picture, version: BlockVersion = 'primary'): Picture => ({
+  ...icon,
+  iconVersion: icon?.iconVersion ?? (version === 'secondary' ? 'white' : 'color'),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.6.23",
+  "version": "0.6.24",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/AccordionItem/AccordionItem.mobile.tsx

@@ -8,6 +8,7 @@ import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { Img } from '../../ui-kit/Img/Img';
 import type { AccordionContent } from '../Accordion/AccordionContent';
 import type { AccordionItemProps } from './AccordionItemProps';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 const icons: IconName[] = ['PlusIcon', 'MinusIcon'];
 
@@ -64,10 +65,22 @@ const FoldButton = JSX<FoldButtonProps>(({ className, icon, label, primaryIcon,
   >
     <span className="text-m-title-xs font-medium pr-2.5 flex group-hover:text-primary-main">
       {primaryIcon ? (
-        <Img image={primaryIcon} className="mr-3 flex-shrink-0" width="24" height="24" asSVG />
+        <Img
+          image={getIconWithVersion(primaryIcon)}
+          className="mr-3 flex-shrink-0"
+          width="24"
+          height="24"
+          asSVG
+        />
       ) : null}
       {label}
     </span>
-    <Img className="flex-shrink-0" image={icon} width="24" height="24" asSVG />
+    <Img
+      className="flex-shrink-0"
+      image={getIconWithVersion({ icon: icon })}
+      width="24"
+      height="24"
+      asSVG
+    />
   </button>
 ));

package/src/components/BenefitsBlock/BenefitsBlock.fixture.tsx

@@ -61,7 +61,7 @@ export default {
             icon: image,
           },
         ]}
-        benefitsBlockVersion="primary"
+        version="primary"
       />
     </div>
   ),
@@ -105,7 +105,7 @@ export default {
             icon: { icon: 'GlobalIcon' },
           },
         ]}
-        benefitsBlockVersion="primary"
+        version="primary"
       />
     </div>
   ),
@@ -150,7 +150,7 @@ export default {
               items: itemsList,
               benefitType: 'list',
             },
-            icon: { icon: 'ActualBalanceIcon' },
+            icon: { icon: 'ActualBalanceIcon', iconVersion: 'normal' },
           },
         ]}
       />
@@ -197,10 +197,10 @@ export default {
               items: itemsList,
               benefitType: 'list',
             },
-            icon: { icon: 'ActualBalanceIcon' },
+            icon: { icon: 'ActualBalanceIcon', iconVersion: 'normal' },
           },
         ]}
-        benefitsBlockVersion="secondary"
+        version="secondary"
       />
     </div>
   ),
@@ -244,7 +244,7 @@ export default {
             icon: { icon: 'GlobalIcon', iconVersion: 'black' },
           },
         ]}
-        benefitsBlockVersion="secondary"
+        version="secondary"
       />
     </div>
   ),