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.

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

Allow NewDot collect customers to add one third-party card feed #56144

Merged
Changes from 1 commit
Commits
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 eslint
  • Loading branch information
narefyev91 committed Jan 31, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 9bac79879c6f255c633b9b74c343ee17c317f540
3 changes: 0 additions & 3 deletions src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import {getCompanyFeeds} from '@libs/CardUtils';
import {getLatestErrorField} from '@libs/ErrorUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -89,7 +88,6 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
const policyID = policy?.id;
const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}_${CONST.EXPENSIFY_CARD.BANK}`);
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID.toString()}`);
const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState(false);
const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState(false);
const [isReportFieldsWarningModalOpen, setIsReportFieldsWarningModalOpen] = useState(false);
@@ -144,7 +142,6 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
subtitleTranslationKey: 'workspace.moreFeatures.companyCards.subtitle',
isActive: policy?.areCompanyCardsEnabled ?? false,
pendingAction: policy?.pendingFields?.areCompanyCardsEnabled,
disabled: !isEmptyObject(getCompanyFeeds(cardFeeds)),
action: (isEnabled: boolean) => {
if (!policyID) {
return;
12 changes: 6 additions & 6 deletions src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ import RadioListItem from '@components/SelectionList/RadioListItem';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as CardUtils from '@libs/CardUtils';
import {getBankCardDetailsImage, getCorrectStepForSelectedBank} from '@libs/CardUtils';
import Navigation from '@navigation/Navigation';
import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
import type {FullScreenNavigatorParamList} from '@navigation/types';
import variables from '@styles/variables';
import * as CompanyCards from '@userActions/CompanyCards';
import {clearAddNewCardFlow, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
@@ -36,10 +36,10 @@ function SelectBankStep() {
setHasError(true);
} else {
if (addNewCard?.data.selectedBank !== bankSelected) {
CompanyCards.clearAddNewCardFlow();
clearAddNewCardFlow();
}
CompanyCards.setAddNewCompanyCardStepAndData({
step: CardUtils.getCorrectStepForSelectedBank(bankSelected),
setAddNewCompanyCardStepAndData({
step: getCorrectStepForSelectedBank(bankSelected),
data: {
selectedBank: bankSelected,
cardTitle: !isOtherBankSelected ? bankSelected : undefined,
@@ -69,7 +69,7 @@ function SelectBankStep() {
isSelected: bankSelected === bank,
leftElement: (
<Icon
src={CardUtils.getBankCardDetailsImage(bank)}
src={getBankCardDetailsImage(bank)}
height={variables.iconSizeExtraLarge}
width={variables.iconSizeExtraLarge}
additionalStyles={styles.mr3}
38 changes: 19 additions & 19 deletions src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@ import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import * as QuickbooksOnline from '@libs/actions/connections/QuickbooksOnline';
import * as Xero from '@libs/actions/connections/Xero';
import {updateQuickbooksOnlineSyncClasses, updateQuickbooksOnlineSyncCustomers, updateQuickbooksOnlineSyncLocations} from '@libs/actions/connections/QuickbooksOnline';
import {updateXeroMappings} from '@libs/actions/connections/Xero';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import * as PolicyUtils from '@libs/PolicyUtils';
import {canModifyPlan, getPerDiemCustomUnit, isControlPolicy} from '@libs/PolicyUtils';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
import * as PerDiem from '@userActions/Policy/PerDiem';
import {enablePerDiem} from '@userActions/Policy/PerDiem';
import CONST from '@src/CONST';
import * as Policy from '@src/libs/actions/Policy/Policy';
import {enableCompanyCards, enablePolicyReportFields, enablePolicyRules, upgradeToCorporate} from '@src/libs/actions/Policy/Policy';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
@@ -49,10 +49,10 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
const qboConfig = policy?.connections?.quickbooksOnline?.config;
const {isOffline} = useNetwork();

const canPerformUpgrade = useMemo(() => PolicyUtils.canModifyPlan(policyID), [policyID]);
const isUpgraded = useMemo(() => PolicyUtils.isControlPolicy(policy), [policy]);
const canPerformUpgrade = useMemo(() => canModifyPlan(policyID), [policyID]);
const isUpgraded = useMemo(() => isControlPolicy(policy), [policy]);

const perDiemCustomUnit = PolicyUtils.getPerDiemCustomUnit(policy);
const perDiemCustomUnit = getPerDiemCustomUnit(policy);
const categoryId = route.params?.categoryId;

const goBack = useCallback(() => {
@@ -93,12 +93,12 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
}
}, [feature, policyID, route.params?.backTo, route.params?.featureName]);

const upgradeToCorporate = () => {
const onUpgradeToCorporate = () => {
if (!canPerformUpgrade || !policy) {
return;
}

Policy.upgradeToCorporate(policy.id, feature?.name);
upgradeToCorporate(policy.id, feature?.name);
};

const confirmUpgrade = useCallback(() => {
@@ -109,39 +109,39 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
switch (route.params.featureName) {
case CONST.REPORT_FIELDS_FEATURE.qbo.classes:
QuickbooksOnline.updateQuickbooksOnlineSyncClasses(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncClasses);
updateQuickbooksOnlineSyncClasses(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncClasses);
break;
case CONST.REPORT_FIELDS_FEATURE.qbo.customers:
QuickbooksOnline.updateQuickbooksOnlineSyncCustomers(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncCustomers);
updateQuickbooksOnlineSyncCustomers(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncCustomers);
break;
case CONST.REPORT_FIELDS_FEATURE.qbo.locations:
QuickbooksOnline.updateQuickbooksOnlineSyncLocations(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncLocations);
updateQuickbooksOnlineSyncLocations(policyID, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD, qboConfig?.syncLocations);
break;
case CONST.REPORT_FIELDS_FEATURE.xero.mapping: {
const {trackingCategories} = policy?.connections?.xero?.data ?? {};
const currentTrackingCategory = trackingCategories?.find((category) => category.id === categoryId);
const {mappings} = policy?.connections?.xero?.config ?? {};
const currentTrackingCategoryValue = currentTrackingCategory ? mappings?.[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${currentTrackingCategory.id}`] ?? '' : '';
Xero.updateXeroMappings(
updateXeroMappings(
policyID,
categoryId ? {[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`]: CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS.REPORT_FIELD} : {},
categoryId ? {[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`]: currentTrackingCategoryValue} : {},
);
break;
}
default: {
Policy.enablePolicyReportFields(policyID, true, false);
enablePolicyReportFields(policyID, true, false);
}
}
break;
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id:
Policy.enablePolicyRules(policyID, true, false);
enablePolicyRules(policyID, true, false);
break;
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCards.id:
Policy.enableCompanyCards(policyID, true, false);
enableCompanyCards(policyID, true, false);
break;
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.perDiem.id:
PerDiem.enablePerDiem(policyID, true, perDiemCustomUnit?.customUnitID, false);
enablePerDiem(policyID, true, perDiemCustomUnit?.customUnitID, false);
break;
default:
}
@@ -199,7 +199,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
<UpgradeIntro
policyID={policyID}
feature={feature}
onUpgrade={upgradeToCorporate}
onUpgrade={onUpgradeToCorporate}
buttonDisabled={isOffline}
loading={policy?.isPendingUpgrade}
/>
Loading