Skip to content

Commit bde7ae7

Browse files
mjasikowskimjasikowski
committed
Merge remote-tracking branch 'origin/main' into revert-52322-intl-bank-account
2 parents 8bccfc0 + 629220d commit bde7ae7

File tree

90 files changed

+1929
-956
lines changed

Some content is hidden

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

90 files changed

+1929
-956
lines changed

‎Mobile-Expensify

‎android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009008002
114-
versionName "9.0.80-2"
113+
versionCode 1009008003
114+
versionName "9.0.80-3"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"

‎ios/NewExpensify/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>9.0.80.2</string>
43+
<string>9.0.80.3</string>
4444
<key>FullStory</key>
4545
<dict>
4646
<key>OrgId</key>

‎ios/NewExpensifyTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>9.0.80.2</string>
22+
<string>9.0.80.3</string>
2323
</dict>
2424
</plist>

‎ios/NotificationServiceExtension/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.0.80</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.80.2</string>
16+
<string>9.0.80.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.0.80-2",
3+
"version": "9.0.80-3",
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.",

‎patches/react-native-reanimated+3.16.4+001+mock-useDerivedValue-getter.patch

-18
This file was deleted.

‎src/App.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {GestureHandlerRootView} from 'react-native-gesture-handler';
55
import {PickerStateProvider} from 'react-native-picker-select';
66
import {SafeAreaProvider} from 'react-native-safe-area-context';
77
import '../wdyr';
8-
import * as ActionSheetAwareScrollView from './components/ActionSheetAwareScrollView';
98
import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
109
import ActiveWorkspaceContextProvider from './components/ActiveWorkspaceProvider';
1110
import ColorSchemeWrapper from './components/ColorSchemeWrapper';
@@ -90,7 +89,6 @@ function App({url}: AppProps) {
9089
CustomStatusBarAndBackgroundContextProvider,
9190
ActiveElementRoleProvider,
9291
ActiveWorkspaceContextProvider,
93-
ActionSheetAwareScrollView.ActionSheetAwareScrollViewProvider,
9492
ReportIDsContextProvider,
9593
PlaybackContextProvider,
9694
FullScreenContextProvider,

‎src/CONST.ts

+4
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,7 @@ const CONST = {
688688
CATEGORY_AND_TAG_APPROVERS: 'categoryAndTagApprovers',
689689
PER_DIEM: 'newDotPerDiem',
690690
PRODUCT_TRAINING: 'productTraining',
691+
NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
691692
},
692693
BUTTON_STATES: {
693694
DEFAULT: 'default',
@@ -2359,6 +2360,7 @@ const CONST = {
23592360
DISTANCE: 'distance',
23602361
MANUAL: 'manual',
23612362
SCAN: 'scan',
2363+
PER_DIEM: 'per-diem',
23622364
},
23632365
REPORT_ACTION_TYPE: {
23642366
PAY: 'pay',
@@ -4612,6 +4614,7 @@ const CONST = {
46124614
MANUAL: 'manual',
46134615
SCAN: 'scan',
46144616
DISTANCE: 'distance',
4617+
PER_DIEM: 'per-diem',
46154618
},
46164619

46174620
STATUS_TEXT_MAX_LENGTH: 100,
@@ -6456,6 +6459,7 @@ const CONST = {
64566459
LHN_WORKSPACE_CHAT_TOOLTIP: 'workspaceChatLHNTooltip',
64576460
GLOBAL_CREATE_TOOLTIP: 'globalCreateTooltip',
64586461
},
6462+
SMART_BANNER_HEIGHT: 152,
64596463
} as const;
64606464

64616465
type Country = keyof typeof CONST.ALL_COUNTRIES;

‎src/ONYXKEYS.ts

+8
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ const ONYXKEYS = {
475475
POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
476476
POLICY_TAGS: 'policyTags_',
477477
POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
478+
POLICY_RECENTLY_USED_DESTINATIONS: 'nvp_recentlyUsedDestinations_',
478479
// Whether the policy's connection data was attempted to be fetched in
479480
// the current user session. As this state only exists client-side, it
480481
// should not be included as part of the policy object. The policy
@@ -620,6 +621,10 @@ const ONYXKEYS = {
620621
MONEY_REQUEST_HOLD_FORM_DRAFT: 'moneyHoldReasonFormDraft',
621622
MONEY_REQUEST_COMPANY_INFO_FORM: 'moneyRequestCompanyInfoForm',
622623
MONEY_REQUEST_COMPANY_INFO_FORM_DRAFT: 'moneyRequestCompanyInfoFormDraft',
624+
MONEY_REQUEST_TIME_FORM: 'moneyRequestTimeForm',
625+
MONEY_REQUEST_TIME_FORM_DRAFT: 'moneyRequestTimeFormDraft',
626+
MONEY_REQUEST_SUBRATE_FORM: 'moneyRequestSubrateForm',
627+
MONEY_REQUEST_SUBRATE_FORM_DRAFT: 'moneyRequestSubrateFormDraft',
623628
NEW_CONTACT_METHOD_FORM: 'newContactMethodForm',
624629
NEW_CONTACT_METHOD_FORM_DRAFT: 'newContactMethodFormDraft',
625630
WAYPOINT_FORM: 'waypointForm',
@@ -765,6 +770,8 @@ type OnyxFormValuesMapping = {
765770
[ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM]: FormTypes.MoneyRequestMerchantForm;
766771
[ONYXKEYS.FORMS.MONEY_REQUEST_AMOUNT_FORM]: FormTypes.MoneyRequestAmountForm;
767772
[ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: FormTypes.MoneyRequestDateForm;
773+
[ONYXKEYS.FORMS.MONEY_REQUEST_TIME_FORM]: FormTypes.MoneyRequestTimeForm;
774+
[ONYXKEYS.FORMS.MONEY_REQUEST_SUBRATE_FORM]: FormTypes.MoneyRequestSubrateForm;
768775
[ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM]: FormTypes.MoneyRequestHoldReasonForm;
769776
[ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM]: FormTypes.MoneyRequestCompanyInfoForm;
770777
[ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: FormTypes.NewContactMethodForm;
@@ -834,6 +841,7 @@ type OnyxCollectionValuesMapping = {
834841
[ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT]: OnyxTypes.PolicyCategories;
835842
[ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagLists;
836843
[ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
844+
[ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_DESTINATIONS]: OnyxTypes.RecentlyUsedCategories;
837845
[ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED]: boolean;
838846
[ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyEmployeeList;
839847
[ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;

‎src/ROUTES.ts

+34
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,36 @@ const ROUTES = {
485485
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
486486
getUrlWithBackToParam(`${action as string}/${iouType as string}/upgrade/${transactionID}/${reportID}`, backTo),
487487
},
488+
MONEY_REQUEST_STEP_DESTINATION: {
489+
route: ':action/:iouType/destination/:transactionID/:reportID',
490+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
491+
getUrlWithBackToParam(`${action as string}/${iouType as string}/destination/${transactionID}/${reportID}`, backTo),
492+
},
493+
MONEY_REQUEST_STEP_TIME: {
494+
route: ':action/:iouType/time/:transactionID/:reportID',
495+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
496+
getUrlWithBackToParam(`${action as string}/${iouType as string}/time/${transactionID}/${reportID}`, backTo),
497+
},
498+
MONEY_REQUEST_STEP_SUBRATE: {
499+
route: ':action/:iouType/subrate/:transactionID/:reportID/:pageIndex',
500+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
501+
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}/0`, backTo),
502+
},
503+
MONEY_REQUEST_STEP_DESTINATION_EDIT: {
504+
route: ':action/:iouType/destination/:transactionID/:reportID/edit',
505+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
506+
getUrlWithBackToParam(`${action as string}/${iouType as string}/destination/${transactionID}/${reportID}/edit`, backTo),
507+
},
508+
MONEY_REQUEST_STEP_TIME_EDIT: {
509+
route: ':action/:iouType/time/:transactionID/:reportID/edit',
510+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
511+
getUrlWithBackToParam(`${action as string}/${iouType as string}/time/${transactionID}/${reportID}/edit`, backTo),
512+
},
513+
MONEY_REQUEST_STEP_SUBRATE_EDIT: {
514+
route: ':action/:iouType/subrate/:transactionID/:reportID/edit/:pageIndex',
515+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, pageIndex = 0, backTo = '') =>
516+
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}/edit/${pageIndex}`, backTo),
517+
},
488518
SETTINGS_TAGS_ROOT: {
489519
route: 'settings/:policyID/tags',
490520
getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags`, backTo),
@@ -645,6 +675,10 @@ const ROUTES = {
645675
route: ':action/:iouType/start/:transactionID/:reportID/scan',
646676
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `create/${iouType as string}/start/${transactionID}/${reportID}/scan` as const,
647677
},
678+
MONEY_REQUEST_CREATE_TAB_PER_DIEM: {
679+
route: ':action/:iouType/start/:transactionID/:reportID/per-diem',
680+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `create/${iouType as string}/start/${transactionID}/${reportID}/per-diem` as const,
681+
},
648682

649683
MONEY_REQUEST_STATE_SELECTOR: {
650684
route: 'submit/state',

‎src/SCREENS.ts

+6
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ const SCREENS = {
230230
RECEIPT: 'Money_Request_Receipt',
231231
STATE_SELECTOR: 'Money_Request_State_Selector',
232232
STEP_ATTENDEES: 'Money_Request_Attendee',
233+
STEP_DESTINATION: 'Money_Request_Destination',
234+
STEP_TIME: 'Money_Request_Time',
235+
STEP_SUBRATE: 'Money_Request_SubRate',
236+
STEP_DESTINATION_EDIT: 'Money_Request_Destination_Edit',
237+
STEP_TIME_EDIT: 'Money_Request_Time_Edit',
238+
STEP_SUBRATE_EDIT: 'Money_Request_SubRate_Edit',
233239
},
234240

235241
TRANSACTION_DUPLICATE: {

‎src/components/ActionSheetAwareScrollView/ActionSheetAwareScrollViewContext.tsx

-140
This file was deleted.

0 commit comments

Comments
 (0)