@momo-kits/foundation 0.169.8 → 0.169.9

package/Application/BottomSheet.hooks.ts

@@ -21,6 +21,8 @@ import { BottomSheetParams, NavigatorProps } from './types';
 import { isIPhoneDuo } from './utils';
 import { useModalLayout } from './modalLayout';
 
+const MAX_IOS_BOTTOM_INSET = 21;
+
 /**
  * Sheet geometry for the current window: foldable placement and size from
  * `useModalLayout`, plus the insets and offsets the keyboard handling needs.
@@ -35,7 +37,10 @@ export const useBottomSheetLayout = () => {
   const insets = useSafeAreaInsets();
   const heightHeader = useHeaderHeight();
   const isIOS = Platform.OS === 'ios';
-  const bottomInset = isIOS ? Math.min(insets.bottom, 21) : insets.bottom;
+  let bottomInset = insets.bottom;
+  if (isIOS) {
+    bottomInset = Math.min(insets.bottom, MAX_IOS_BOTTOM_INSET);
+  }
   const keyboardOffset = heightHeader - bottomInset;
 
   return {
@@ -68,7 +73,7 @@ export const useDuoKeyboardLift = (
     if (!isDuo || !useKeyboardAvoidingView) {
       return;
     }
-    const onKeyboardChange = (e: KeyboardEvent) => {
+    const handleKeyboardChange = (e: KeyboardEvent) => {
       const overlap = windowHeight - e.endCoordinates.screenY;
       const lift = Math.max(
         overlap - bottomInset - (keyboardVerticalOffset ?? 0),
@@ -86,8 +91,8 @@ export const useDuoKeyboardLift = (
       setKeyboardLift(lift);
     };
     const subscriptions = [
-      Keyboard.addListener('keyboardWillChangeFrame', onKeyboardChange),
-      Keyboard.addListener('keyboardWillHide', onKeyboardChange),
+      Keyboard.addListener('keyboardWillChangeFrame', handleKeyboardChange),
+      Keyboard.addListener('keyboardWillHide', handleKeyboardChange),
     ];
     return () => subscriptions.forEach(sub => sub.remove());
   }, [
@@ -149,7 +154,7 @@ export const useSheetDismiss = ({
   leftOptions,
   action,
 }: SheetDismissParams) => {
-  const onDismiss = useCallback(
+  const handleDismiss = useCallback(
     (force = false, callback?: () => void) => {
       if (barrierDismissible && !force) {
         return;
@@ -164,32 +169,37 @@ export const useSheetDismiss = ({
     [barrierDismissible, closeAnimation, navigator],
   );
 
-  const onRequestClose = useCallback(
+  const handleRequestClose = useCallback(
     (callback?: () => void) => {
-      onDismiss(true, callback);
+      handleDismiss(true, callback);
     },
-    [onDismiss],
+    [handleDismiss],
   );
 
   useEffect(() => {
     const backHandler = BackHandler.addEventListener(
       'hardwareBackPress',
       () => {
-        onDismiss();
+        handleDismiss();
         return true;
       },
     );
     return () => backHandler.remove();
-  }, [barrierDismissible, onDismiss]);
+  }, [barrierDismissible, handleDismiss]);
 
-  const onPressBack = useCallback(() => {
-    onDismiss(true, leftOptions?.onPressIconLeft);
-  }, [leftOptions, onDismiss]);
+  const handlePressBack = useCallback(() => {
+    handleDismiss(true, leftOptions?.onPressIconLeft);
+  }, [leftOptions, handleDismiss]);
 
-  const onPressClose = useCallback(() => {
+  const handlePressClose = useCallback(() => {
     action.current = 'icon_close';
-    onDismiss(true);
-  }, [action, onDismiss]);
+    handleDismiss(true);
+  }, [action, handleDismiss]);
 
-  return { onDismiss, onRequestClose, onPressBack, onPressClose };
+  return {
+    handleDismiss,
+    handleRequestClose,
+    handlePressBack,
+    handlePressClose,
+  };
 };

package/Application/BottomSheet.tsx

@@ -30,6 +30,23 @@ import {
   renderSheetHeader,
 } from './BottomSheet.parts';
 
+const OPEN_TIMING = {
+  duration: 350,
+  easing: Easing.bezier(0.05, 0.7, 0.1, 1),
+};
+const CLOSE_TIMING = {
+  duration: 200,
+  easing: Easing.bezier(0.3, 0.0, 0.8, 0.15),
+};
+const SETTLE_SPRING = {
+  damping: 20,
+  mass: 1,
+  stiffness: 100,
+  overshootClamping: false,
+  energyThreshold: 1e-10,
+};
+const DISMISS_DRAG_DISTANCE = 100;
+
 /**
  * Bottom sheet route of the modal stack: slides the given screen up under a
  * drag handle and header, and reports how it was closed through `onDismiss`.
@@ -79,22 +96,14 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   );
 
   const openAnimation = useCallback(() => {
-    translateY.value = withTiming(0, {
-      duration: 350,
-      easing: Easing.bezier(0.05, 0.7, 0.1, 1),
-    });
+    translateY.value = withTiming(0, OPEN_TIMING);
   }, [translateY]);
 
   const closeAnimation = useCallback(
     (callback = () => {}) => {
-      translateY.value = withTiming(
-        heightDevice,
-        {
-          duration: 200,
-          easing: Easing.bezier(0.3, 0.0, 0.8, 0.15),
-        },
-        () => scheduleOnRN(callback),
-      );
+      translateY.value = withTiming(heightDevice, CLOSE_TIMING, () => {
+        return scheduleOnRN(callback);
+      });
     },
     [heightDevice, translateY],
   );
@@ -111,17 +120,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
         }
       },
       onPanResponderRelease: (_, gestureState) => {
-        if (gestureState.dy > 100) {
+        if (gestureState.dy > DISMISS_DRAG_DISTANCE) {
           action.current = 'gesture';
-          onDismiss(true);
+          handleDismiss(true);
         } else {
-          translateY.value = withSpring(0, {
-            damping: 20,
-            mass: 1,
-            stiffness: 100,
-            overshootClamping: false,
-            energyThreshold: 1e-10,
-          });
+          translateY.value = withSpring(0, SETTLE_SPRING);
         }
       },
     }),
@@ -151,7 +154,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     leftOptions,
     action,
   });
-  const { onDismiss, onRequestClose, onPressBack, onPressClose } = handlers;
+  const {
+    handleDismiss,
+    handleRequestClose,
+    handlePressBack,
+    handlePressClose,
+  } = handlers;
 
   const showBack = !!leftOptions?.onPressIconLeft;
   const iconBack = leftOptions?.iconLeft ?? 'ic_back';
@@ -161,8 +169,8 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     useDivider,
     theme,
     showBack,
-    onPressBack,
-    onPressClose,
+    onPressBack: handlePressBack,
+    onPressClose: handlePressClose,
     iconBack,
     options,
     leftOptions,
@@ -178,7 +186,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     <Screen
       {...props}
       {...props.route.params}
-      onRequestClose={onRequestClose}
+      onRequestClose={handleRequestClose}
     />
   );
 
@@ -205,7 +213,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       transparent
       visible={true}
       onRequestClose={() => {
-        onDismiss();
+        handleDismiss();
       }}
       style={StyleSheet.absoluteFillObject}
       isModalKit={true}
@@ -225,7 +233,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           style={StyleSheet.absoluteFillObject}
           onPress={() => {
             action.current = 'touch';
-            onDismiss();
+            handleDismiss();
           }}
         >
           <Animated.View style={[styles.overlay, animatedOverlayStyle]} />

package/Application/BottomTab/BottomTabBar.tsx

@@ -54,16 +54,16 @@ const useCenterActionPress = () => {
   const buttonStyle = useAnimatedStyle(() => ({
     transform: [{ scale: scale.value }],
   }));
-  const onPressIn = () => {
+  const handlePressIn = () => {
     scale.value = withTiming(
       TabBarMotion.ctaPressedScale,
       TabBarMotion.ctaPress,
     );
   };
-  const onPressOut = () => {
+  const handlePressOut = () => {
     scale.value = withTiming(1, TabBarMotion.ctaPress);
   };
-  return { buttonStyle, onPressIn, onPressOut };
+  return { buttonStyle, handlePressIn, handlePressOut };
 };
 
 /**
@@ -77,7 +77,7 @@ const CenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
   const context = useContext<any>(MiniAppContext);
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
   const { icon, label, onPress, labelContent } = floatingButton;
-  const { buttonStyle, onPressIn, onPressOut } = useCenterActionPress();
+  const { buttonStyle, handlePressIn, handlePressOut } = useCenterActionPress();
   let iconNode = icon;
   if (typeof icon === 'string') {
     iconNode = (
@@ -95,8 +95,8 @@ const CenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
         accessibilityRole={'button'}
         accessibilityLabel={label}
         onPress={onPress}
-        onPressIn={onPressIn}
-        onPressOut={onPressOut}
+        onPressIn={handlePressIn}
+        onPressOut={handlePressOut}
         style={styles.cta}
       >
         <Animated.View

package/Application/BottomTab/DuoRailTabBar.tsx

@@ -94,14 +94,14 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
   floatingButton,
 }) => {
   const { theme } = useContext(ApplicationContext);
-  const { buttonStyle, onPressIn, onPressOut } = useCenterActionPress();
+  const { buttonStyle, handlePressIn, handlePressOut } = useCenterActionPress();
   return (
     <Pressable
       accessibilityRole={'button'}
       accessibilityLabel={floatingButton.label}
       onPress={floatingButton.onPress}
-      onPressIn={onPressIn}
-      onPressOut={onPressOut}
+      onPressIn={handlePressIn}
+      onPressOut={handlePressOut}
       style={styles.railCta}
     >
       <Animated.View
@@ -190,8 +190,8 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
             accessibilityLabel={current?.label}
             accessibilityHint={'bottom_tab_bar'}
             activeOpacity={1}
-            onPressIn={compactLift.onPressIn}
-            onPressOut={compactLift.onPressOut}
+            onPressIn={compactLift.handlePressIn}
+            onPressOut={compactLift.handlePressOut}
             onPress={expandTabBar}
             style={styles.railCompact}
           >

package/Application/BottomTab/TabScreen.tsx

@@ -15,6 +15,8 @@ import { useScreenLayout } from '../../Layout';
 import { getHeaderRowOptions } from '../../Layout/utils';
 import { BottomTabInsetContext } from './BottomTabInset';
 
+const NAVIGATED_REPORT_DELAY = 100;
+
 const Stack = createStackNavigator();
 
 /**
@@ -29,16 +31,15 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
 
   const screenName = screen?.name || screen?.type?.name || 'Invalid';
   const { isBackgroundToForeground } = useAppState();
-  // Pad clear of the floating bar unless a Screen inside claims the inset to scroll under it.
   const { inset: tabBarInset } = useContext(BottomTabInsetContext);
-  const [insetClaimed, setInsetClaimed] = useState(false);
+  const [isInsetClaimed, setIsInsetClaimed] = useState(false);
   const tabInsetValue = useMemo(
-    () => ({ inset: tabBarInset, claim: () => setInsetClaimed(true) }),
+    () => ({ inset: tabBarInset, claim: () => setIsInsetClaimed(true) }),
     [tabBarInset],
   );
-  const tabInsetStyle = { paddingBottom: insetClaimed ? 0 : tabBarInset };
+  const tabInsetStyle = { paddingBottom: isInsetClaimed ? 0 : tabBarInset };
 
-  const onScreenNavigated = (pre: string, current: string) => {
+  const handleScreenNavigated = (pre: string, current: string) => {
     if (!isBackgroundToForeground) {
       const data: any = {
         preScreenName: pre,
@@ -68,13 +69,13 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
           navigator?.maxApi?.getDataObserver?.(
             'current_screen',
             (data: any) => {
-              onScreenNavigated(data?.screenName, screenName);
+              handleScreenNavigated(data?.screenName, screenName);
               navigator?.maxApi?.setObserver?.('current_screen', {
                 screenName,
               });
             },
           );
-        }, 100);
+        }, NAVIGATED_REPORT_DELAY);
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [],
@@ -83,12 +84,12 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
 
   useEffect(
     () => {
-      const onFocusApp = navigator?.maxApi?.listen?.('onFocusApp', () => {
+      const focusAppListener = navigator?.maxApi?.listen?.('onFocusApp', () => {
         if (navigation.isFocused()) {
           navigator?.maxApi?.getDataObserver?.(
             'current_screen',
             (data: any) => {
-              onScreenNavigated(data?.screenName, screenName);
+              handleScreenNavigated(data?.screenName, screenName);
               navigator?.maxApi?.setObserver?.('current_screen', {
                 screenName,
               });
@@ -98,7 +99,7 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
       });
 
       return () => {
-        onFocusApp?.remove?.();
+        focusAppListener?.remove?.();
       };
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/Application/BottomTab/index.tsx

@@ -99,16 +99,16 @@ const BottomTab: React.FC<BottomTabProps> = ({
     }, []),
   );
 
-  const onFocus = (e: any) => {
+  const handleFocus = (e: any) => {
     activeIndex.current = tabs.findIndex(i => e.target.includes(i.name));
 
     const isFirstTab = activeIndex.current === 0;
-    const gestureEnabled = Platform.OS === 'ios' && isFirstTab;
+    const isGestureEnabled = Platform.OS === 'ios' && isFirstTab;
     navigation?.setOptions({
-      gestureEnabled: gestureEnabled,
+      gestureEnabled: isGestureEnabled,
     });
     NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(
-      !gestureEnabled,
+      !isGestureEnabled,
     );
   };
 
@@ -123,7 +123,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
       listeners?.tabPress?.(e);
     },
     focus: e => {
-      onFocus(e);
+      handleFocus(e);
       StatusBar.setBarStyle('dark-content', true);
       listeners?.focus?.(e);
     },

package/Application/BottomTab/usePressLift.ts

@@ -18,15 +18,15 @@ const usePressLift = () => {
   const style = useAnimatedStyle(() => ({
     transform: [{ scale: 1 + lift.value * (PRESSED_SCALE - 1) }],
   }));
-  const onPressIn = () => {
+  const handlePressIn = () => {
     if (!reduceMotion) {
       lift.value = withSpring(1, SPRING);
     }
   };
-  const onPressOut = () => {
+  const handlePressOut = () => {
     lift.value = withSpring(0, SPRING);
   };
-  return { style, onPressIn, onPressOut };
+  return { style, handlePressIn, handlePressOut };
 };
 
 export { usePressLift };

package/Application/Components/HeaderToolkitAction.tsx

@@ -12,6 +12,10 @@ import { useToolkitActions } from './useToolkitActions';
 
 const CLOSE_ICON = '16_navigation_close_circle';
 const HOME_ICON = '16_basic_home';
+const TOOLKIT_ICON_SIZE = 20;
+// the capsule's two buttons extend their touch area outward only
+const HELP_CENTER_HIT_SLOP = { top: 7, bottom: 7, left: 7, right: 0 };
+const CLOSE_HIT_SLOP = { top: 7, bottom: 7, left: 0, right: 7 };
 
 /**
  * Header toolkit: optional shortcut plus the help center / close capsule. When
@@ -37,8 +41,8 @@ const HeaderToolkitAction: React.FC<any> = ({
     iconShortcut,
     shortcutOnPress,
     showBadge,
-    onPressHelpCenter,
-    onClose,
+    handlePressHelpCenter,
+    handleClose,
   } = useToolkitActions({
     preventClose,
     useSystemTools,
@@ -56,14 +60,14 @@ const HeaderToolkitAction: React.FC<any> = ({
     };
   }
 
-  const useHelpCenter = context.appId !== 'vn.momo.helpcenter';
+  const hasHelpCenter = context.appId !== 'vn.momo.helpcenter';
   const closeIcon = useCloseIcon ? CLOSE_ICON : HOME_ICON;
   let toolkitWidthStyle: ViewStyle = styles.toolkitNarrow;
-  if (useHelpCenter) {
+  if (hasHelpCenter) {
     toolkitWidthStyle = styles.toolkitWide;
   }
 
-  const groupCount = useHelpCenter ? 2 : 1;
+  const groupCount = hasHelpCenter ? 2 : 1;
   let capsuleHeight = DuoMetrics.controlSize;
   if (groupCount > 1) {
     capsuleHeight = groupCount * DuoMetrics.itemPitch;
@@ -112,19 +116,19 @@ const HeaderToolkitAction: React.FC<any> = ({
           />
         )}
         <SideBarGroup tintColor={tintColor}>
-          {useHelpCenter && (
+          {hasHelpCenter && (
             <SideBarGroupItem
               accessibilityLabel={'btn_navigation_help_center'}
               icon={'help_center'}
               tintColor={tintColor}
-              onPress={onPressHelpCenter}
+              onPress={handlePressHelpCenter}
             />
           )}
           <SideBarGroupItem
             accessibilityLabel={'btn_navigation_close'}
             icon={closeIcon}
             tintColor={tintColor}
-            onPress={onClose}
+            onPress={handleClose}
           />
         </SideBarGroup>
       </View>
@@ -145,19 +149,19 @@ const HeaderToolkitAction: React.FC<any> = ({
           />
         )}
         <SideBarGroup tintColor={tintColor} horizontal>
-          {useHelpCenter && (
+          {hasHelpCenter && (
             <SideBarGroupItem
               accessibilityLabel={'btn_navigation_help_center'}
               icon={'help_center'}
               tintColor={tintColor}
-              onPress={onPressHelpCenter}
+              onPress={handlePressHelpCenter}
             />
           )}
           <SideBarGroupItem
             accessibilityLabel={'btn_navigation_close'}
             icon={closeIcon}
             tintColor={tintColor}
-            onPress={onClose}
+            onPress={handleClose}
           />
         </SideBarGroup>
       </View>
@@ -176,26 +180,30 @@ const HeaderToolkitAction: React.FC<any> = ({
         />
       )}
       <View style={[styles.toolkitContainer, buttonStyle, toolkitWidthStyle]}>
-        {useHelpCenter && (
+        {hasHelpCenter && (
           <>
             <TouchableOpacity
               accessibilityLabel={'btn_navigation_help_center'}
               style={styles.toolkitButton}
-              onPress={onPressHelpCenter}
-              hitSlop={{ top: 7, bottom: 7, left: 7, right: 0 }}
+              onPress={handlePressHelpCenter}
+              hitSlop={HELP_CENTER_HIT_SLOP}
             >
-              <Icon color={tintColor} source={'help_center'} size={20} />
+              <Icon
+                color={tintColor}
+                source={'help_center'}
+                size={TOOLKIT_ICON_SIZE}
+              />
             </TouchableOpacity>
             <View style={[styles.divider, { backgroundColor: tintColor }]} />
           </>
         )}
         <TouchableOpacity
           accessibilityLabel={'btn_navigation_close'}
-          onPress={onClose}
+          onPress={handleClose}
           style={styles.toolkitButton}
-          hitSlop={{ top: 7, bottom: 7, left: 0, right: 7 }}
+          hitSlop={CLOSE_HIT_SLOP}
         >
-          <Icon color={tintColor} source={closeIcon} size={20} />
+          <Icon color={tintColor} source={closeIcon} size={TOOLKIT_ICON_SIZE} />
         </TouchableOpacity>
       </View>
     </View>

package/Application/Components/useToolkitActions.tsx

@@ -4,6 +4,7 @@ import { PopupNotify } from '../../Popup';
 import { Tool, ToolGroup } from '../types';
 
 const DID_SYNC_NEW_HOME = 'did_sync_new_home';
+const LOADING_RESET_DELAY = 1000;
 
 type ToolkitActionsParams = {
   preventClose?: any;
@@ -49,8 +50,8 @@ const useToolkitActions = ({
       const favoriteObserver = navigator?.maxApi?.observer?.(
         DID_SYNC_NEW_HOME,
         (updatedData: any) => {
-          const status = updatedData?.items?.includes(context?.code);
-          setIsFavorite(status);
+          const isInFavorites = updatedData?.items?.includes(context?.code);
+          setIsFavorite(isInFavorites);
         },
       );
       return () => {
@@ -59,7 +60,7 @@ const useToolkitActions = ({
     }
   }, [useShortcut, context, checkAppIsFavorite, navigator?.maxApi]);
 
-  const onDismiss = () => {
+  const handleDismiss = () => {
     if (useCloseIcon) {
       navigator?.maxApi?.dispatchFunction?.(
         'dismiss',
@@ -71,7 +72,7 @@ const useToolkitActions = ({
     }
   };
 
-  const onClose = () => {
+  const handleClose = () => {
     const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
     context?.autoTracking?.({
       ...context,
@@ -89,24 +90,24 @@ const useToolkitActions = ({
               title: preventClose.primary.title,
               onPress: () => {
                 preventClose?.primary.onPress();
-                onDismiss();
+                handleDismiss();
               },
             }}
           />
         ),
       });
     } else {
-      onDismiss();
+      handleDismiss();
     }
   };
 
-  const onPressShortcut = () => {
+  const handlePressShortcut = () => {
     const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
-    const expected = !isFavorite;
+    const shouldBeFavorite = !isFavorite;
     context?.autoTracking?.({
       ...context,
       componentName: 'IconButton',
-      componentId: `${expected ? 'pin' : 'unpin'}_shortcut`,
+      componentId: `${shouldBeFavorite ? 'pin' : 'unpin'}_shortcut`,
       screenName: currentRoute?.params?.screen?.name ?? currentRoute?.name,
     });
     setIsLoading(true);
@@ -120,16 +121,16 @@ const useToolkitActions = ({
       },
       ({ success }: { success: boolean }) => {
         if (success) {
-          setIsFavorite(expected);
+          setIsFavorite(shouldBeFavorite);
         }
       },
     );
     setTimeout(() => {
       setIsLoading(false);
-    }, 1000);
+    }, LOADING_RESET_DELAY);
   };
 
-  const onPressHelpCenter = () => {
+  const handlePressHelpCenter = () => {
     const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
     context?.autoTracking?.({
       ...context,
@@ -141,7 +142,7 @@ const useToolkitActions = ({
     navigator?.maxApi?.dispatchFunction?.('showHelpCenter', context);
   };
 
-  const onPressIconMore = () => {
+  const handlePressIconMore = () => {
     const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
     context?.autoTracking?.({
       ...context,
@@ -172,18 +173,18 @@ const useToolkitActions = ({
   };
 
   let iconShortcut = isFavorite ? 'pin_star_checked' : 'pin_star';
-  let shortcutOnPress = onPressShortcut;
+  let shortcutOnPress = handlePressShortcut;
   const totalTools = tools.reduce(
     (count: number, group: ToolGroup) => count + group?.items?.length,
     0,
   );
-  const showIconMore = tools && totalTools > 1;
-  const isHaveOneTool = tools && totalTools === 1;
+  const hasManyTools = tools && totalTools > 1;
+  const hasOneTool = tools && totalTools === 1;
 
-  if (showIconMore || useMore) {
+  if (hasManyTools || useMore) {
     iconShortcut = 'navigation_more_icon';
-    shortcutOnPress = onPressIconMore;
-  } else if (isHaveOneTool) {
+    shortcutOnPress = handlePressIconMore;
+  } else if (hasOneTool) {
     const singleToolGroup = tools.find(
       (group: ToolGroup) => group?.items?.length === 1,
     );
@@ -210,8 +211,8 @@ const useToolkitActions = ({
     iconShortcut,
     shortcutOnPress,
     showBadge,
-    onPressHelpCenter,
-    onClose,
+    handlePressHelpCenter,
+    handleClose,
   };
 };