Skip to content

Commit 008e834

Browse files
authored
Merge pull request #55387 from nkdengineer/fix/54389
fix: logic enable allow deleting transaction
2 parents f71f36e + cb12d5d commit 008e834

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import Text from '@components/Text';
1212
import useLocalize from '@hooks/useLocalize';
1313
import usePolicy from '@hooks/usePolicy';
1414
import useThemeStyles from '@hooks/useThemeStyles';
15-
import * as CardUtils from '@libs/CardUtils';
15+
import {deleteWorkspaceCompanyCardFeed, setWorkspaceCompanyCardTransactionLiability} from '@libs/actions/CompanyCards';
16+
import {getCompanyFeeds, getCustomOrFormattedFeedName, getSelectedFeed} from '@libs/CardUtils';
1617
import Navigation from '@libs/Navigation/Navigation';
1718
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
1819
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
1920
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
2021
import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
21-
import * as CompanyCards from '@userActions/CompanyCards';
2222
import CONST from '@src/CONST';
2323
import ONYXKEYS from '@src/ONYXKEYS';
2424
import ROUTES from '@src/ROUTES';
@@ -41,12 +41,12 @@ function WorkspaceCompanyCardsSettingsPage({
4141
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
4242
const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
4343
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we want to run the hook only once to escape unexpected feed change
44-
const selectedFeed = useMemo(() => CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds), []);
44+
const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), []);
4545
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`);
46-
const feedName = CardUtils.getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
47-
const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds);
46+
const feedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
47+
const companyFeeds = getCompanyFeeds(cardFeeds);
4848
const liabilityType = selectedFeed && companyFeeds[selectedFeed]?.liabilityType;
49-
const isPersonal = liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW;
49+
const isPersonal = liabilityType !== CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.RESTRICT;
5050

5151
const navigateToChangeFeedName = () => {
5252
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS_FEED_NAME.getRoute(policyID));
@@ -59,7 +59,7 @@ function WorkspaceCompanyCardsSettingsPage({
5959
const feedToOpen = (Object.keys(companyFeeds) as CompanyCardFeed[])
6060
.filter((feed) => feed !== selectedFeed && companyFeeds[feed]?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
6161
.at(0);
62-
CompanyCards.deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen);
62+
deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen);
6363
}
6464
setDeleteCompanyCardConfirmModalVisible(false);
6565
Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
@@ -69,7 +69,7 @@ function WorkspaceCompanyCardsSettingsPage({
6969
if (!selectedFeed) {
7070
return;
7171
}
72-
CompanyCards.setWorkspaceCompanyCardTransactionLiability(
72+
setWorkspaceCompanyCardTransactionLiability(
7373
workspaceAccountID,
7474
policyID,
7575
selectedFeed,

0 commit comments

Comments
 (0)