review fixes

Author: jmusial

src/components/CategorySelector/index.tsx

@@ -8,7 +8,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 
-type CategorySelectorProps = {
+type CustomUnitDefaultCategorySelectorProps = {
     /** Currently selected category */
     defaultValue?: string;
 
@@ -25,7 +25,7 @@ type CategorySelectorProps = {
     customUnitID: string;
 };
 
-function CategorySelector({defaultValue = '', wrapperStyle, label, focused, customUnitID}: CategorySelectorProps) {
+function CustomUnitDefaultCategorySelector({defaultValue = '', wrapperStyle, label, focused, customUnitID}: CustomUnitDefaultCategorySelectorProps) {
     const styles = useThemeStyles();
 
     const decodedCategoryName = getDecodedCategoryName(defaultValue);
@@ -49,4 +49,4 @@ function CategorySelector({defaultValue = '', wrapperStyle, label, focused, cust
     );
 }
 
-export default CategorySelector;
+export default CustomUnitDefaultCategorySelector;

src/pages/workspace/categories/DynamicDefaultCategorySelectorPage.tsx

@@ -7,6 +7,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -23,7 +24,7 @@ function DynamicDefaultCategorySelectorPage({route}: DynamicDefaultCategorySelec
     const {policyID, customUnitID} = route.params;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(policyID)}`);
     const currentCategory = policy?.customUnits?.[customUnitID]?.defaultCategory ?? '';
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.DEFAULT_CATEGORY_SELECTOR.path);
 

src/pages/workspace/categories/DynamicSpendCategorySelectorPage.tsx

@@ -6,6 +6,7 @@ import type {ListItem} from '@components/SelectionList/types';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -23,7 +24,7 @@ function DynamicSpendCategorySelectorPage({route}: DynamicSpendCategorySelectorP
     const styles = useThemeStyles();
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.SPEND_CATEGORY_SELECTOR.path);
 
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(policyID)}`);
     const label = groupID.charAt(0).toUpperCase() + groupID.slice(1);
     const currentCategory = policy?.mccGroup?.[groupID]?.category ?? '';
 

src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {View} from 'react-native';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import CategorySelector from '@components/CategorySelector';
+import CustomUnitDefaultCategorySelector from '@components/CategorySelector';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import RenderHTML from '@components/RenderHTML';
@@ -113,7 +113,7 @@ function PolicyDistanceRatesSettingsPage({route}: PolicyDistanceRatesSettingsPag
                                     errorRowStyles={styles.mh5}
                                     onClose={() => clearErrorFields('defaultCategory')}
                                 >
-                                    <CategorySelector
+                                    <CustomUnitDefaultCategorySelector
                                         label={translate('workspace.common.defaultCategory')}
                                         defaultValue={defaultCategory}
                                         wrapperStyle={[styles.ph5, styles.mt3]}

src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {View} from 'react-native';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import CategorySelector from '@components/CategorySelector';
+import CustomUnitDefaultCategorySelector from '@components/CategorySelector';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -73,7 +73,7 @@ function WorkspacePerDiemSettingsPage({route}: WorkspacePerDiemSettingsPageProps
                                 errorRowStyles={styles.mh5}
                                 onClose={() => clearErrorFields('defaultCategory')}
                             >
-                                <CategorySelector
+                                <CustomUnitDefaultCategorySelector
                                     label={translate('workspace.common.defaultCategory')}
                                     defaultValue={defaultCategory}
                                     wrapperStyle={[styles.ph5, styles.mt3]}