Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP Staging] Select subcategory as the default spend category #48708

Merged
merged 6 commits into from
Sep 6, 2024
Merged

[CP Staging] Select subcategory as the default spend category #48708

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f03c6e
fix: subcategories bug
BartoszGrajdek Sep 6, 2024
b9c42f5
fix: android closing modal
BartoszGrajdek Sep 6, 2024
4b9d332
Merge remote-tracking branch 'origin/main' into @BartoszGrajdek/spend…
BartoszGrajdek Sep 6, 2024
67a0c77
fix: prettier
BartoszGrajdek Sep 6, 2024
80027ce
fix: react compiler error
BartoszGrajdek Sep 6, 2024
cfbd0b3
refactor: remove noop function
BartoszGrajdek Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: react compiler error
  • Loading branch information
@BartoszGrajdek
BartoszGrajdek committed Sep 6, 2024
commit 80027ce895187639977cc6c6ce63eef24046a237
51 changes: 26 additions & 25 deletions src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
View file
Original file line number Diff line number Diff line change
@@ -37,22 +37,32 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
setWorkspaceRequiresCategory(policyID, value);
};

const data = useMemo(() => {
if (!(currentPolicy && currentPolicy.mccGroup)) {
return [];
const policyMccGroup = currentPolicy?.mccGroup;
const listItems = useMemo(() => {
let data: ListItem[] = [];

if (policyMccGroup) {
data = Object.entries(policyMccGroup).map(
([mccKey, mccGroup]) =>
({
categoryID: mccGroup.category,
keyForList: mccKey,
groupID: mccKey,
policyID,
tabIndex: -1,
} as ListItem),
);
}

return Object.entries(currentPolicy.mccGroup).map(
([mccKey, mccGroup]) =>
({
categoryID: mccGroup.category,
keyForList: mccKey,
groupID: mccKey,
policyID,
tabIndex: -1,
} as ListItem),
);
}, [currentPolicy, policyID]);
return data.map((item) => (
<SpendCategorySelectorListItem
key={item.keyForList}
item={item}
onSelectRow={() => {}}
showTooltip
/>
));
}, [policyMccGroup, policyID]);

const hasEnabledOptions = OptionsListUtils.hasEnabledOptions(policyCategories ?? {});
const isToggleDisabled = !policy?.areCategoriesEnabled || !hasEnabledOptions || isConnectedToAccounting;
@@ -83,22 +93,13 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
shouldPlaceSubtitleBelowSwitch
/>
<View style={[styles.containerWithSpaceBetween]}>
{!!currentPolicy && data.length > 0 && (
{!!currentPolicy && listItems && (
<>
<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>
<ScrollView>
{data.map((item) => (
<SpendCategorySelectorListItem
key={item.keyForList}
item={item}
onSelectRow={() => {}}
showTooltip
/>
))}
</ScrollView>
<ScrollView>{listItems}</ScrollView>
</>
)}
</View>
Loading