Skip to content

Commit 9d8e880

Browse files
mkzie2mkzie2
committed
Merge branch 'main' into mkzie2-issue/65647
2 parents bd1dc26 + 8339cb4 commit 9d8e880

33 files changed

Lines changed: 454 additions & 62 deletions

File tree

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009018106
118-
versionName "9.1.81-6"
117+
versionCode 1009018107
118+
versionName "9.1.81-7"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
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.1.81.6</string>
47+
<string>9.1.81.7</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.1.81</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.81.6</string>
16+
<string>9.1.81.7</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.1.81</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.81.6</string>
16+
<string>9.1.81.7</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.1.81-6",
3+
"version": "9.1.81-7",
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/CONST/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,7 @@ const CONST = {
20662066
TAG: 'TAG',
20672067
REPORT_FIELD: 'REPORT_FIELD',
20682068
},
2069+
ACCOUNTING_METHOD: 'accountingMethod',
20692070
},
20702071

20712072
SAGE_INTACCT_MAPPING_VALUE: {

‎src/ROUTES.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2150,17 +2150,45 @@ const ROUTES = {
21502150
return `workspaces/${policyID}/accounting/xero/advanced` as const;
21512151
},
21522152
},
2153+
POLICY_ACCOUNTING_XERO_AUTO_SYNC: {
2154+
route: 'workspaces/:policyID/accounting/xero/advanced/autosync',
2155+
getRoute: (policyID: string | undefined, backTo?: string) => {
2156+
if (!policyID) {
2157+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_XERO_AUTO_SYNC route');
2158+
}
2159+
return getUrlWithBackToParam(`workspaces/${policyID}/accounting/xero/advanced/autosync` as const, backTo);
2160+
},
2161+
},
2162+
POLICY_ACCOUNTING_XERO_ACCOUNTING_METHOD: {
2163+
route: 'workspaces/:policyID/accounting/xero/advanced/autosync/accounting-method',
2164+
getRoute: (policyID: string | undefined, backTo?: string) => {
2165+
if (!policyID) {
2166+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_XERO_ACCOUNTING_METHOD route');
2167+
}
2168+
return getUrlWithBackToParam(`workspaces/${policyID}/accounting/xero/advanced/autosync/accounting-method` as const, backTo);
2169+
},
2170+
},
21532171
POLICY_ACCOUNTING_XERO_BILL_STATUS_SELECTOR: {
21542172
route: 'workspaces/:policyID/accounting/xero/export/purchase-bill-status-selector',
21552173
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/xero/export/purchase-bill-status-selector` as const, backTo),
21562174
},
21572175
POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR: {
21582176
route: 'workspaces/:policyID/accounting/xero/advanced/invoice-account-selector',
2159-
getRoute: (policyID: string) => `workspaces/${policyID}/accounting/xero/advanced/invoice-account-selector` as const,
2177+
getRoute: (policyID: string | undefined) => {
2178+
if (!policyID) {
2179+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR route');
2180+
}
2181+
return `workspaces/${policyID}/accounting/xero/advanced/invoice-account-selector` as const;
2182+
},
21602183
},
21612184
POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: {
21622185
route: 'workspaces/:policyID/accounting/xero/advanced/bill-payment-account-selector',
2163-
getRoute: (policyID: string) => `workspaces/${policyID}/accounting/xero/advanced/bill-payment-account-selector` as const,
2186+
getRoute: (policyID: string | undefined) => {
2187+
if (!policyID) {
2188+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR route');
2189+
}
2190+
return `workspaces/${policyID}/accounting/xero/advanced/bill-payment-account-selector` as const;
2191+
},
21642192
},
21652193
POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT: {
21662194
route: 'workspaces/:policyID/accounting/quickbooks-online/import',

‎src/SCREENS.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ const SCREENS = {
435435
XERO_EXPORT: 'Policy_Accounting_Xero_Export',
436436
XERO_EXPORT_PURCHASE_BILL_DATE_SELECT: 'Policy_Accounting_Xero_Export_Purchase_Bill_Date_Select',
437437
XERO_ADVANCED: 'Policy_Accounting_Xero_Advanced',
438+
XERO_AUTO_SYNC: 'Policy_Accounting_Xero_Auto_Sync',
439+
XERO_ACCOUNTING_METHOD: 'Policy_Accounting_Xero_Accounting_Method',
438440
XERO_BILL_STATUS_SELECTOR: 'Policy_Accounting_Xero_Export_Bill_Status_Selector',
439441
XERO_INVOICE_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Invoice_Account_Selector',
440442
XERO_EXPORT_PREFERRED_EXPORTER_SELECT: 'Workspace_Accounting_Xero_Export_Preferred_Exporter_Select',

0 commit comments

Comments
 (0)