Skip to content

Commit be11c1e

Browse files
DylanDylannDylanDylann
committed
merge main
2 parents e5b5c24 + 40a8a01 commit be11c1e

62 files changed

Lines changed: 330 additions & 692 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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 1009036903
115-
versionName "9.3.69-3"
114+
versionCode 1009036904
115+
versionName "9.3.69-4"
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.69.3</string>
47+
<string>9.3.69.4</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.69</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.69.3</string>
16+
<string>9.3.69.4</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.69</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.69.3</string>
16+
<string>9.3.69.4</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.69-3",
3+
"version": "9.3.69-4",
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,6 @@ const CONST = {
13821382
SECONDARY_ACTIONS: {
13831383
SUBMIT: 'submit',
13841384
APPROVE: 'approve',
1385-
RECEIVED_PAYMENT: 'receivedPayment',
13861385
REMOVE_HOLD: 'removeHold',
13871386
UNAPPROVE: 'unapprove',
13881387
CANCEL_PAYMENT: 'cancelPayment',
@@ -2095,6 +2094,7 @@ const CONST = {
20952094
ATTRIBUTE_MIN_DURATION: 'min_duration',
20962095
ATTRIBUTE_FINISHED_MANUALLY: 'finished_manually',
20972096
ATTRIBUTE_IS_WARM: 'is_warm',
2097+
ATTRIBUTE_LAZY_TAB_FALLBACK_SHOWN: 'lazy_tab_fallback_shown',
20982098
ATTRIBUTE_WAS_LIST_EMPTY: 'was_list_empty',
20992099
ATTRIBUTE_SKELETON_PREFIX: 'skeleton.',
21002100
ATTRIBUTE_SCENARIO: 'scenario',
@@ -9131,7 +9131,6 @@ const CONST = {
91319131
CLOSE_PDF_MODAL: 'MoreMenu-ClosePDFModal',
91329132
SUBMIT: 'MoreMenu-Submit',
91339133
APPROVE: 'MoreMenu-Approve',
9134-
RECEIVED_PAYMENT: 'MoreMenu-ReceivedPayment',
91359134
UNAPPROVE: 'MoreMenu-Unapprove',
91369135
CANCEL_PAYMENT: 'MoreMenu-CancelPayment',
91379136
HOLD: 'MoreMenu-Hold',

‎src/ROUTES.ts‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,29 +149,33 @@ const DYNAMIC_ROUTES = {
149149
path: 'journal-posting-preference/select',
150150
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT_EXPENSES],
151151
},
152+
POLICY_ACCOUNTING_NETSUITE_EXPORT: {
153+
path: 'connections/netsuite/export',
154+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.ROOT, SCREENS.WORKSPACE.COMPANY_CARD_EXPORT],
155+
},
152156
POLICY_ACCOUNTING_NETSUITE_RECEIVABLE_ACCOUNT_SELECT: {
153157
path: 'receivable-account/select',
154-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT],
158+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT],
155159
},
156160
POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT: {
157161
path: 'invoice-item-preference/select',
158-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT],
162+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT],
159163
},
160164
POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_SELECT: {
161165
path: 'invoice-item/select',
162166
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT],
163167
},
164168
POLICY_ACCOUNTING_NETSUITE_PREFERRED_EXPORTER_SELECT: {
165169
path: 'preferred-exporter/select',
166-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT],
170+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT],
167171
},
168172
POLICY_ACCOUNTING_NETSUITE_DATE_SELECT: {
169173
path: 'date/select',
170-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT],
174+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT],
171175
},
172176
POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES: {
173177
path: 'expenses/:expenseType',
174-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT],
178+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT],
175179
getRoute: (expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) => `expenses/${expenseType as string}` as const,
176180
},
177181
POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT: {
@@ -3760,17 +3764,6 @@ const ROUTES = {
37603764
route: 'workspaces/:policyID/accounting/netsuite/import/customer-projects/select',
37613765
getRoute: (policyID: string) => `workspaces/${policyID}/accounting/netsuite/import/customer-projects/select` as const,
37623766
},
3763-
POLICY_ACCOUNTING_NETSUITE_EXPORT: {
3764-
route: 'workspaces/:policyID/connections/netsuite/export/',
3765-
getRoute: (policyID: string | undefined, backTo?: string) => {
3766-
if (!policyID) {
3767-
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_NETSUITE_EXPORT route');
3768-
}
3769-
3770-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3771-
return getUrlWithBackToParam(`workspaces/${policyID}/connections/netsuite/export/` as const, backTo, false);
3772-
},
3773-
},
37743767
POLICY_ACCOUNTING_NETSUITE_TAX_POSTING_ACCOUNT_SELECT: {
37753768
route: 'workspaces/:policyID/connections/netsuite/export/tax-posting-account/select',
37763769
getRoute: (policyID: string) => `workspaces/${policyID}/connections/netsuite/export/tax-posting-account/select` as const,

‎src/SCREENS.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ const SCREENS = {
625625
NETSUITE_TOKEN_INPUT: 'Policy_Accounting_NetSuite_Token_Input',
626626
NETSUITE_SUBSIDIARY_SELECTOR: 'Policy_Accounting_NetSuite_Subsidiary_Selector',
627627
NETSUITE_IMPORT: 'Policy_Accounting_NetSuite_Import',
628-
NETSUITE_EXPORT: 'Policy_Accounting_NetSuite_Export',
628+
DYNAMIC_NETSUITE_EXPORT: 'Dynamic_Policy_Accounting_NetSuite_Export',
629629
DYNAMIC_NETSUITE_PREFERRED_EXPORTER_SELECT: 'Dynamic_Policy_Accounting_NetSuite_Preferred_Exporter_Select',
630630
DYNAMIC_NETSUITE_DATE_SELECT: 'Dynamic_Policy_Accounting_NetSuite_Date_Select',
631631
DYNAMIC_NETSUITE_EXPORT_EXPENSES: 'Dynamic_Policy_Accounting_NetSuite_Export_Expenses',

0 commit comments

Comments
 (0)