Skip to content

Commit

Permalink
Merge pull request #42919 from mananjadhav/workspace-more-features-modal
Browse files Browse the repository at this point in the history 
[Wave Collect] [Xero] Remove text jitter for More Features modal
  • Loading branch information
@MariaHCD
MariaHCD authored Jun 4, 2024
2 parents bc3009a + 32110d9 commit ba5c201
Showing 1 changed file with 22 additions and 46 deletions.
68 changes: 22 additions & 46 deletions src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscree
import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
import ToggleSettingOptionRow from './workflows/ToggleSettingsOptionRow';

type ItemType = 'organize' | 'integrate';
type ConnectionWarningModalState = {
isOpen: boolean;
itemType?: ItemType;
};

type WorkspaceMoreFeaturesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.MORE_FEATURES>;

type Item = {
Expand Down Expand Up @@ -66,7 +60,8 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
const isSyncTaxEnabled = !!policy?.connections?.quickbooksOnline?.config.syncTax || !!policy?.connections?.xero?.config.importTaxRates;
const policyID = policy?.id ?? '';

const [connectionWarningModalState, setConnectionWarningModalState] = useState<ConnectionWarningModalState>({isOpen: false});
const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState<boolean>(false);
const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState<boolean>(false);

const spendItems: Item[] = [
{
Expand Down Expand Up @@ -101,10 +96,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
pendingAction: policy?.pendingFields?.areCategoriesEnabled,
action: (isEnabled: boolean) => {
if (hasAccountingConnection) {
setConnectionWarningModalState({
isOpen: true,
itemType: 'organize',
});
setIsOrganizeWarningModalOpen(true);
return;
}
Category.enablePolicyCategories(policy?.id ?? '', isEnabled);
Expand All @@ -119,10 +111,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
pendingAction: policy?.pendingFields?.areTagsEnabled,
action: (isEnabled: boolean) => {
if (hasAccountingConnection) {
setConnectionWarningModalState({
isOpen: true,
itemType: 'organize',
});
setIsOrganizeWarningModalOpen(true);
return;
}
Tag.enablePolicyTags(policy?.id ?? '', isEnabled);
Expand All @@ -137,10 +126,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
pendingAction: policy?.pendingFields?.tax,
action: (isEnabled: boolean) => {
if (hasAccountingConnection) {
setConnectionWarningModalState({
isOpen: true,
itemType: 'organize',
});
setIsOrganizeWarningModalOpen(true);
return;
}
Policy.enablePolicyTaxes(policy?.id ?? '', isEnabled);
Expand All @@ -157,10 +143,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
pendingAction: policy?.pendingFields?.areConnectionsEnabled,
action: (isEnabled: boolean) => {
if (hasAccountingConnection) {
setConnectionWarningModalState({
isOpen: true,
itemType: 'integrate',
});
setIsIntegrateWarningModalOpen(true);
return;
}
Policy.enablePolicyConnections(policy?.id ?? '', isEnabled);
Expand Down Expand Up @@ -247,17 +230,6 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
}, [fetchFeatures]),
);

const getConnectionWarningPrompt = useCallback(() => {
switch (connectionWarningModalState.itemType) {
case 'organize':
return translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledText');
case 'integrate':
return translate('workspace.moreFeatures.connectionsWarningModal.disconnectText');
default:
return undefined;
}
}, [connectionWarningModalState.itemType, translate]);

return (
<AccessOrNotFoundWrapper
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
Expand All @@ -280,20 +252,24 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
<ConfirmModal
title={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledTitle')}
onConfirm={() => {
setConnectionWarningModalState({
isOpen: false,
itemType: undefined,
});
setIsOrganizeWarningModalOpen(false);
Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID));
}}
onCancel={() => setIsOrganizeWarningModalOpen(false)}
isVisible={isOrganizeWarningModalOpen}
prompt={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledText')}
confirmText={translate('workspace.moreFeatures.connectionsWarningModal.manageSettings')}
cancelText={translate('common.cancel')}
/>
<ConfirmModal
title={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledTitle')}
onConfirm={() => {
setIsIntegrateWarningModalOpen(false);
Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID));
}}
onCancel={() =>
setConnectionWarningModalState({
isOpen: false,
itemType: undefined,
})
}
isVisible={connectionWarningModalState.isOpen}
prompt={getConnectionWarningPrompt()}
onCancel={() => setIsIntegrateWarningModalOpen(false)}
isVisible={isIntegrateWarningModalOpen}
prompt={translate('workspace.moreFeatures.connectionsWarningModal.disconnectText')}
confirmText={translate('workspace.moreFeatures.connectionsWarningModal.manageSettings')}
cancelText={translate('common.cancel')}
/>
Expand Down

0 comments on commit ba5c201

Please sign in to comment.