refactor: address review comments

Expensify · Sep 4, 2024 · 7343191 · 7343191
1 parent 5981f6e
commit 7343191
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -3468,7 +3468,6 @@ function setWorkspaceDefaultSpendCategory(policyID: string, groupID: string, cat
                   onyxMethod: Onyx.METHOD.MERGE,
                   key: `policy_${policyID}`,
                   value: {
-                      isPendingUpgrade: true,
                       mccGroup: {
                           ...mccGroup,
                           [groupID]: {
@@ -3481,32 +3480,19 @@ function setWorkspaceDefaultSpendCategory(policyID: string, groupID: string, cat
           ]
         : [];
 
-    const successData: OnyxUpdate[] = mccGroup
-        ? [
-              {
-                  onyxMethod: Onyx.METHOD.MERGE,
-                  key: `policy_${policyID}`,
-                  value: {
-                      isPendingUpgrade: false,
-                  },
-              },
-          ]
-        : [];
-
     const failureData: OnyxUpdate[] = mccGroup
         ? [
               {
                   onyxMethod: Onyx.METHOD.MERGE,
                   key: `policy_${policyID}`,
                   value: {
-                      isPendingUpgrade: false,
                       mccGroup,
                   },
               },
           ]
         : [];
 
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_DEFAULT_SPEND_CATEGORY, {policyID, groupID, category}, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_DEFAULT_SPEND_CATEGORY, {policyID, groupID, category}, {optimisticData, successData: [], failureData});
 }
 /**
  * Call the API to set the receipt required amount for the given policy

diff --git a/...electionList/CategorySelectorListItem.tsx → ...egories/SpendCategorySelectorListItem.tsx b/...electionList/CategorySelectorListItem.tsx → ...egories/SpendCategorySelectorListItem.tsx
@@ -1,11 +1,11 @@
 import React, {useState} from 'react';
+import BaseListItem from '@components/SelectionList/BaseListItem';
+import type {BaseListItemProps, ListItem} from '@components/SelectionList/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CategorySelector from '@pages/workspace/distanceRates/CategorySelector';
 import * as Policy from '@userActions/Policy/Policy';
-import BaseListItem from './BaseListItem';
-import type {InviteMemberListItemProps, ListItem} from './types';
 
-function CategorySelectorListItem<TItem extends ListItem>({item, onSelectRow, isFocused}: InviteMemberListItemProps<TItem>) {
+function SpendCategorySelectorListItem<TItem extends ListItem>({item, onSelectRow, isFocused}: BaseListItemProps<TItem>) {
     const styles = useThemeStyles();
     const [isCategoryPickerVisible, setIsCategoryPickerVisible] = useState(false);
     const {policyID, groupID, categoryID} = item;
@@ -52,6 +52,6 @@ function CategorySelectorListItem<TItem extends ListItem>({item, onSelectRow, is
     );
 }
 
-CategorySelectorListItem.displayName = 'CategorySelectorListItem';
+SpendCategorySelectorListItem.displayName = 'SpendCategorySelectorListItem';
 
-export default CategorySelectorListItem;
+export default SpendCategorySelectorListItem;
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -4,7 +4,7 @@ import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
-import CategorySelectorListItem from '@components/SelectionList/CategorySelectorListItem';
+import SpendCategorySelectorListItem from '@components/SelectionList/SpendCategorySelectorListItem';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
@@ -92,13 +92,13 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                     {!!currentPolicy && sections?.length > 0 && (
                         <SelectionList
                             headerContent={
-                                <View style={[styles.mh5, styles.mt2]}>
+                                <View style={[styles.mh5, styles.mt2, styles.mb1]}>
                                     <Text style={[styles.headerText]}>{translate('workspace.categories.defaultSpendCategories')}</Text>
                                     <Text style={[styles.mt1, styles.lh20]}>{translate('workspace.categories.spendCategoriesDescription')}</Text>
                                 </View>
                             }
                             sections={sections}
-                            ListItem={CategorySelectorListItem}
+                            ListItem={SpendCategorySelectorListItem}
                             onSelectRow={() => {}}
                         />
                     )}