Skip to content

Commit ce2c02c

Browse files
roryabrahamroryabraham
authored
Merge pull request #88494 from Expensify/cherry-pick-staging-88490-24752440269-1
🍒 Cherry pick PR #88490 to staging 🍒
2 parents f5b3b31 + 7715c4f commit ce2c02c

21 files changed

Lines changed: 148 additions & 111 deletions

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009036101
115-
versionName "9.3.61-1"
114+
versionCode 1009036102
115+
versionName "9.3.61-2"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

‎ios/NewExpensify/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.61.1</string>
47+
<string>9.3.61.2</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.61</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.61.1</string>
16+
<string>9.3.61.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.61</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.61.1</string>
16+
<string>9.3.61.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.3.61-1",
3+
"version": "9.3.61-2",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

‎src/ROUTES.ts‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -196,39 +196,19 @@ const DYNAMIC_ROUTES = {
196196
path: 'invoice-account-select',
197197
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_QUICKBOOKS_ONLINE_EXPORT],
198198
},
199-
POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER: {
200-
path: 'sage-preferred-exporter',
201-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT],
202-
},
203-
POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE: {
204-
path: 'date',
205-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT],
206-
},
207-
POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES: {
208-
path: 'reimbursable',
209-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT],
210-
},
211-
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: {
212-
path: 'nonreimbursable',
213-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT],
214-
},
215199
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: {
216-
path: 'nonreimbursable-expenses',
217-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
218-
},
219-
POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_DESTINATION: {
220-
path: 'reimbursable-expenses',
221-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_REIMBURSABLE_EXPENSES],
200+
path: 'destination',
201+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
222202
},
223203
POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR: {
224204
path: 'default-vendor',
225-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_REIMBURSABLE_EXPENSES, SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
205+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES, SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
226206
getRoute: (reimbursable: string) => getUrlWithParams('default-vendor', {reimbursable}),
227207
queryParams: ['reimbursable'],
228208
},
229209
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: {
230210
path: 'credit-card-account',
231-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
211+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
232212
},
233213
POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC: {
234214
path: 'sage-intacct-autosync',
@@ -3852,6 +3832,36 @@ const ROUTES = {
38523832
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
38533833
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export` as const, backTo, false),
38543834
},
3835+
POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER: {
3836+
route: 'workspaces/:policyID/accounting/sage-intacct/export/preferred-exporter',
3837+
3838+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3839+
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/preferred-exporter` as const, backTo),
3840+
},
3841+
POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE: {
3842+
route: 'workspaces/:policyID/accounting/sage-intacct/export/date',
3843+
3844+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3845+
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/date` as const, backTo),
3846+
},
3847+
POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES: {
3848+
route: 'workspaces/:policyID/accounting/sage-intacct/export/reimbursable',
3849+
3850+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3851+
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/reimbursable` as const, backTo),
3852+
},
3853+
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: {
3854+
route: 'workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable',
3855+
3856+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3857+
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable` as const, backTo),
3858+
},
3859+
POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_DESTINATION: {
3860+
route: 'workspaces/:policyID/accounting/sage-intacct/export/reimbursable/destination',
3861+
3862+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3863+
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/reimbursable/destination` as const, backTo),
3864+
},
38553865
POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED: {
38563866
route: 'workspaces/:policyID/accounting/sage-intacct/advanced',
38573867
getRoute: (policyID: string | undefined) => {

‎src/SCREENS.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -641,11 +641,11 @@ const SCREENS = {
641641
SAGE_INTACCT_ADD_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Add_User_Dimension',
642642
SAGE_INTACCT_EDIT_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Edit_User_Dimension',
643643
SAGE_INTACCT_EXPORT: 'Policy_Accounting_Sage_Intacct_Export',
644-
DYNAMIC_SAGE_INTACCT_PREFERRED_EXPORTER: 'Dynamic_Policy_Accounting_Sage_Intacct_Preferred_Exporter',
645-
DYNAMIC_SAGE_INTACCT_EXPORT_DATE: 'Dynamic_Policy_Accounting_Sage_Intacct_Export_Date',
646-
DYNAMIC_SAGE_INTACCT_REIMBURSABLE_EXPENSES: 'Dynamic_Policy_Accounting_Sage_Intacct_Reimbursable_Expenses',
647-
DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Expenses',
648-
DYNAMIC_SAGE_INTACCT_REIMBURSABLE_DESTINATION: 'Dynamic_Policy_Accounting_Sage_Intacct_Reimbursable_Destination',
644+
SAGE_INTACCT_PREFERRED_EXPORTER: 'Policy_Accounting_Sage_Intacct_Preferred_Exporter',
645+
SAGE_INTACCT_EXPORT_DATE: 'Policy_Accounting_Sage_Intacct_Export_Date',
646+
SAGE_INTACCT_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Reimbursable_Expenses',
647+
SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Expenses',
648+
SAGE_INTACCT_REIMBURSABLE_DESTINATION: 'Policy_Accounting_Sage_Intacct_Reimbursable_Destination',
649649
DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Destination',
650650
DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR: 'Dynamic_Policy_Accounting_Sage_Intacct_Default_Vendor',
651651
DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account',

‎src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -777,16 +777,15 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
777777
[SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default,
778778
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ENTITY]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/SageIntacctEntityPage').default,
779779
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctExportPage').default,
780-
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_PREFERRED_EXPORTER]: () =>
781-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctPreferredExporterPage').default,
782-
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_EXPORT_DATE]: () =>
783-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctExportDatePage').default,
784-
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_REIMBURSABLE_EXPENSES]: () =>
785-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctReimbursableExpensesPage').default,
786-
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: () =>
787-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableExpensesPage').default,
788-
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_REIMBURSABLE_DESTINATION]: () =>
789-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctReimbursableExpensesDestinationPage').default,
780+
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER]: () =>
781+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage').default,
782+
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctDatePage').default,
783+
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: () =>
784+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage').default,
785+
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: () =>
786+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage').default,
787+
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_DESTINATION]: () =>
788+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesDestinationPage').default,
790789
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: () =>
791790
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableExpensesDestinationPage').default,
792791
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR]: () =>

0 commit comments

Comments
 (0)