From a76df82df5fb1a274cd599baa5c8b4b380bee517 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 17 Jan 2025 15:58:12 +0700 Subject: [PATCH 1/3] fix: logic enable allow deleting transaction --- .../companyCards/WorkspaceCompanyCardsSettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 60774c448546..1502b29698fe 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -46,7 +46,7 @@ function WorkspaceCompanyCardsSettingsPage({ const feedName = CardUtils.getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames); const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds); const liabilityType = selectedFeed && companyFeeds[selectedFeed]?.liabilityType; - const isPersonal = liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW; + const isPersonal = liabilityType !== CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.RESTRICT; const navigateToChangeFeedName = () => { Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS_FEED_NAME.getRoute(policyID)); From 32ef60344e491a62774508304e9ede854037b8d9 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 17 Jan 2025 16:27:34 +0700 Subject: [PATCH 2/3] fix lint --- .../WorkspaceCompanyCardsSettingsPage.tsx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 1502b29698fe..c4e27b03d932 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -12,13 +12,13 @@ import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import usePolicy from '@hooks/usePolicy'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as CardUtils from '@libs/CardUtils'; +import {deleteWorkspaceCompanyCardFeed, setWorkspaceCompanyCardTransactionLiability} from '@libs/actions/CompanyCards'; +import {getCompanyFeeds, getCustomOrFormattedFeedName, getSelectedFeed} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; -import * as CompanyCards from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; @@ -41,10 +41,10 @@ function WorkspaceCompanyCardsSettingsPage({ const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`); const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`); // 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 - const selectedFeed = useMemo(() => CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds), []); + const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), []); const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`); - const feedName = CardUtils.getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames); - const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds); + const feedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames); + const companyFeeds = getCompanyFeeds(cardFeeds); const liabilityType = selectedFeed && companyFeeds[selectedFeed]?.liabilityType; const isPersonal = liabilityType !== CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.RESTRICT; @@ -59,7 +59,7 @@ function WorkspaceCompanyCardsSettingsPage({ const feedToOpen = (Object.keys(companyFeeds) as CompanyCardFeed[]) .filter((feed) => feed !== selectedFeed && companyFeeds[feed]?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) .at(0); - CompanyCards.deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen); + deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen); } setDeleteCompanyCardConfirmModalVisible(false); Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack); @@ -69,7 +69,7 @@ function WorkspaceCompanyCardsSettingsPage({ if (!selectedFeed) { return; } - CompanyCards.setWorkspaceCompanyCardTransactionLiability( + setWorkspaceCompanyCardTransactionLiability( workspaceAccountID, policyID, selectedFeed, @@ -92,23 +92,23 @@ function WorkspaceCompanyCardsSettingsPage({ - {translate('workspace.moreFeatures.companyCards.setTransactionLiabilityDescription')} + {translate('workspace.moreFeatures.setTransactionLiabilityDescription')} setDeleteCompanyCardConfirmModalVisible(true)} /> @@ -116,8 +116,8 @@ function WorkspaceCompanyCardsSettingsPage({ isVisible={deleteCompanyCardConfirmModalVisible} onConfirm={deleteCompanyCardFeed} onCancel={() => setDeleteCompanyCardConfirmModalVisible(false)} - title={feedName && translate('workspace.moreFeatures.companyCards.removeCardFeedTitle', {feedName})} - prompt={translate('workspace.moreFeatures.companyCards.removeCardFeedDescription')} + title={feedName && translate('workspace.moreFeatures.removeCardFeedTitle', {feedName})} + prompt={translate('workspace.moreFeatures.removeCardFeedDescription')} confirmText={translate('common.delete')} cancelText={translate('common.cancel')} danger From cb12d5da7a5939b2980ced7e7339ceabdcbe4ed4 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 17 Jan 2025 16:45:38 +0700 Subject: [PATCH 3/3] fix typescript --- .../WorkspaceCompanyCardsSettingsPage.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index c4e27b03d932..ab90f952fdaf 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -92,23 +92,23 @@ function WorkspaceCompanyCardsSettingsPage({ - {translate('workspace.moreFeatures.setTransactionLiabilityDescription')} + {translate('workspace.moreFeatures.companyCards.setTransactionLiabilityDescription')} setDeleteCompanyCardConfirmModalVisible(true)} /> @@ -116,8 +116,8 @@ function WorkspaceCompanyCardsSettingsPage({ isVisible={deleteCompanyCardConfirmModalVisible} onConfirm={deleteCompanyCardFeed} onCancel={() => setDeleteCompanyCardConfirmModalVisible(false)} - title={feedName && translate('workspace.moreFeatures.removeCardFeedTitle', {feedName})} - prompt={translate('workspace.moreFeatures.removeCardFeedDescription')} + title={feedName && translate('workspace.moreFeatures.companyCards.removeCardFeedTitle', {feedName})} + prompt={translate('workspace.moreFeatures.companyCards.removeCardFeedDescription')} confirmText={translate('common.delete')} cancelText={translate('common.cancel')} danger