-
Notifications
You must be signed in to change notification settings - Fork 3.9k
fix: correct autosync navigation for QBD and Sage Intacct in card reconciliation page #72796
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c6404e6
fix: correct autosync navigation for QBD and Sage Intacct in card rec…
daledah 7da6f1c
fix lint
daledah ba09013
Merge branch 'main' into fix/71875
daledah c8df623
fix: replace backTo usage
daledah 8417752
Merge branch 'main' into fix/71875
daledah 3284019
fix lint
daledah File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 3 additions & 69 deletions
72
src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPageBase.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import {CONST as COMMON_CONST} from 'expensify-common'; | ||
| import React, {useCallback} from 'react'; | ||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
| import ConnectionLayout from '@components/ConnectionLayout'; | ||
| import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; | ||
| import OfflineWithFeedback from '@components/OfflineWithFeedback'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import {updateSageIntacctAutoSync} from '@libs/actions/connections/SageIntacct'; | ||
| import {getLatestErrorField} from '@libs/ErrorUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import {settingsPendingAction} from '@libs/PolicyUtils'; | ||
| import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; | ||
| import {clearSageIntacctErrorField} from '@userActions/Policy/Policy'; | ||
| import CONST from '@src/CONST'; | ||
| import type {TranslationPaths} from '@src/languages/types'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type {Route} from '@src/ROUTES'; | ||
| import type {Policy} from '@src/types/onyx'; | ||
|
|
||
| type SageIntacctAutoSyncPageBaseParams = { | ||
| policy: OnyxEntry<Policy>; | ||
| navigateBackTo?: Route; | ||
| }; | ||
|
|
||
| function SageIntacctAutoSyncPageBase({policy, navigateBackTo}: SageIntacctAutoSyncPageBaseParams) { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const policyID = policy?.id; | ||
| const config = policy?.connections?.intacct?.config; | ||
| const {autoSync, pendingFields} = config ?? {}; | ||
| const accountingMethod = config?.export?.accountingMethod ?? COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH; | ||
| const pendingAction = settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC], pendingFields) ?? settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.ACCOUNTING_METHOD], pendingFields); | ||
|
|
||
| const goBack = useCallback(() => { | ||
| Navigation.goBack(navigateBackTo ?? ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID)); | ||
| }, [navigateBackTo, policyID]); | ||
|
|
||
| return ( | ||
| <ConnectionLayout | ||
| displayName={SageIntacctAutoSyncPageBase.displayName} | ||
| headerTitle="common.settings" | ||
| accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]} | ||
| policyID={policyID} | ||
| featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED} | ||
| contentContainerStyle={styles.pb2} | ||
| titleStyle={styles.ph5} | ||
| connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT} | ||
| onBackButtonPress={goBack} | ||
| shouldBeBlocked={false} | ||
| > | ||
| <ToggleSettingOptionRow | ||
| key={translate('workspace.sageIntacct.autoSync')} | ||
| title={translate('workspace.sageIntacct.autoSync')} | ||
| subtitle={translate('workspace.sageIntacct.autoSyncDescription')} | ||
| switchAccessibilityLabel={translate('workspace.sageIntacct.autoSyncDescription')} | ||
| isActive={!!autoSync?.enabled} | ||
| wrapperStyle={[styles.pv2, styles.mh5]} | ||
| shouldPlaceSubtitleBelowSwitch | ||
| onToggle={() => updateSageIntacctAutoSync(policyID, !autoSync?.enabled)} | ||
| pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED], pendingFields)} | ||
| errors={getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED)} | ||
| onCloseError={() => clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED)} | ||
| /> | ||
| {!!autoSync?.enabled && ( | ||
| <OfflineWithFeedback pendingAction={pendingAction}> | ||
| <MenuItemWithTopDescription | ||
| title={ | ||
| accountingMethod === COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL | ||
| ? translate(`workspace.sageIntacct.accountingMethods.values.${COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL}` as TranslationPaths) | ||
| : translate(`workspace.sageIntacct.accountingMethods.values.${COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH}` as TranslationPaths) | ||
| } | ||
| description={translate('workspace.sageIntacct.accountingMethods.label')} | ||
| shouldShowRightIcon | ||
| onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.getRoute(policyID))} | ||
| /> | ||
| </OfflineWithFeedback> | ||
| )} | ||
| </ConnectionLayout> | ||
| ); | ||
| } | ||
|
|
||
| SageIntacctAutoSyncPageBase.displayName = 'SageIntacctAutoSyncPageBase'; | ||
|
|
||
| export default SageIntacctAutoSyncPageBase; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.