Commit 0b9f888
committed
Merge remote-tracking branch 'origin/main' into cm-add-dateoption-card-util
Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
# Conflicts:
# src/libs/CardUtils.ts
# src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
# src/pages/workspace/companyCards/assignCard/InviteNewMemberStep.tsx1,515 files changed
Lines changed: 33393 additions & 19093 deletions
File tree
- .claude
- agents
- skills
- coding-standards/rules
- playwright-app-testing
- .github
- actions/javascript
- authorChecklist
- awaitStagingDeploys
- checkAndroidStatus
- checkDeployBlockers
- checkSVGCompression
- createOrUpdateStagingDeploy
- failureNotifier
- formatCodeCovComment
- getArtifactInfo
- getDeployPullRequestList
- getPreviousVersion
- getPullRequestDetails
- getPullRequestIncrementalChanges
- isStagingDeployLocked
- markPullRequestsAsDeployed
- postTestBuildComment
- proposalPoliceComment
- reopenIssueWithComment
- reviewerChecklist
- verifySignedCommits
- waitForPreviousRuns
- libs
- scripts
- workflows
- __mocks__/@react-native-firebase
- android
- app
- src
- e2edelta
- e2e
- main/java/com/expensify/chat
- assets/images
- contributingGuides
- philosophies
- docs
- Hidden
- _layouts
- _sass
- articles
- expensify-classic
- connections
- expenses
- workspaces
- new-expensify
- concierge-ai
- domains
- getting-started
- insights
- reports-and-expenses
- settings
- wallet-and-payments
- workspaces
- assets
- images
- js
- eslint-plugin-react-compiler-compat
- fastlane
- ios
- NewExpensify.xcodeproj
- NewExpensify
- NotificationServiceExtension
- jest
- patches
- @react-native-firebase/crashlytics
- @trivago/prettier-plugin-sort-imports
- perf-profiler
- react-native-pdf
- prompts/translation
- scripts
- src
- CONST
- components
- AddPaymentCard
- AddressSearch
- AnchorForAttachmentsOnly
- Attachments
- AttachmentCarousel
- AttachmentView
- ButtonWithDropdownMenu
- CategorySelector
- Charts
- BarChart
- LineChart
- hooks
- CollapsibleSection
- Composer
- ConnectToNetSuiteFlow
- ConnectToQuickbooksOnlineFlow
- ConnectToXeroFlow
- ContactPermissionModal
- CurrencyListContextProvider
- CustomStatusBarAndBackground
- DatePicker
- DelegateNoAccessModalProvider
- DistanceRequest
- EmojiPicker/EmojiPickerMenu
- EmptyStateComponent
- ErrorBoundary
- FloatingCameraButton
- FloatingGPSButton
- Form
- GPSInProgressModal
- GPSTripStateChecker
- HTMLEngineProvider/HTMLRenderers
- MentionReportRenderer
- Icon
- chunks
- Image
- ImportOnyxState
- InvertedFlatList
- KYCWall
- KeyboardDismissibleFlatList
- LHNOptionsList
- Lightbox
- MapView
- Modal/Global
- MoneyRequestReportView
- MultifactorAuthentication
- Context
- components
- OutcomeScreen/FailureScreen
- config
- scenarios
- Onfido
- OpenAppFailureModal
- PDFView
- Pressable/GenericPressable
- ProductTrainingContext
- Reactions
- QuickEmojiReactions
- RecordTroubleshootDataToolMenu
- RNFS
- ReportActionAvatars
- ReportActionItem
- MoneyRequestReportPreview
- TransactionPreview
- Rule
- ScreenWrapper
- Search
- FilterComponents
- FilterDropdowns
- SearchList
- SearchPageHeader
- SearchRouter
- Section
- SelectionListWithSections
- Search
- SelectionList
- ListItem
- components
- SettlementButton
- SidePanel
- HelpComponents
- SidePanelModal
- SignInButtons
- AppleAuthWrapper
- AppleSignIn
- GoogleSignIn
- SubStepForms
- TabSelector
- Table
- TestCrash
- TestDrive
- Modal
- TextInput/BaseTextInput
- implementation
- ThreeDotsMenu
- TransactionItemRow
- DataCells
- UserDetailsTooltip/BaseUserDetailsTooltip
- ValidateCodeActionModal
- ValidateCodeForm
- ValidateCode
- VideoPlayerContexts
- VideoPlayer
- VideoPlayerControls/ProgressBar
- WalletStatementModal
- WideRHPContextProvider
- hooks
- useAncestors
- usePolicyData
- useReportScrollManager
- useSearchBackPress
- languages
- libs
- API
- parameters
- Console
- E2E
- actions
- interactions
- tests
- utils
- Firebase
- Middleware
- Network
- OptionsListUtils
- Pusher
- TransactionUtils
- Violations
- actions
- IOU
- OnyxDerived
- configs
- OnyxUpdateManager
- utils
- __mocks__
- Policy
- Report
- Session
- Welcome
- setCrashlyticsUserId
- telemetry
- integrations
- middlewares
- testCrash
- pages
- Debug
- ReportAction
- Report
- Transaction
- EnablePayments
- AddBankAccount
- substeps
- FeesAndTerms/substeps
- PersonalInfo
- substeps
- TermsPage
- VerifyIdentity
- ErrorPage
- MissingPersonalDetails
- subPages
- MultifactorAuthentication
- OnboardingAccounting
- OnboardingEmployees
- OnboardingInterestedFeatures
- OnboardingPersonalDetails
- OnboardingPrivateDomain
- OnboardingPurpose
- OnboardingWorkEmailValidation
- OnboardingWorkEmail
- OnboardingWorkspaceConfirmation
- OnboardingWorkspaceCurrency
- OnboardingWorkspaceInvite
- OnboardingWorkspaceOptional
- OnboardingWorkspaces
- PrivateNotes
- ReimbursementAccount
- EnterSignerInfo
- subSteps
- NonUSD
- Agreements
- BankInfo
- subSteps
- BeneficialOwnerInfo
- BeneficialOwnerDetailsFormSubSteps
- BusinessInfo
- subSteps
- Docusign
- Finish
- SignerInfo
- subSteps
- USD
- BankInfo
- subSteps
- BeneficialOwnerInfo
- subSteps
- BusinessInfo
- subSteps
- CompleteVerification
- subSteps
- ConnectBankAccount
- components
- Requestor
- PersonalInfo
- subSteps
- VerifyIdentity
- ScheduleCall
- Search
- SearchAdvancedFiltersPage
- SearchFiltersReportFieldPage
- TeachersUnite
- TransactionDuplicate
- TransactionMerge
- Travel
- ValidateLoginPage
- domain
- Admins
- Groups
- Members
- Saml
- home
- AssignedCardsSection
- ForYouSection
- TimeSensitiveSection
- hooks
- items
- inbox
- report
- ContextMenu
- ReactionList/PopoverReactionList
- ReportActionCompose
- ComposerWithSuggestions
- SilentCommentUpdater
- comment
- sidebar
- iou
- request
- step
- IOURequestStepDistanceGPS
- Disclaimer
- DistanceCounter
- TripStatusIndicator
- GPSButtons
- Waypoints
- IOURequestStepScan
- ReceiptPreviews
- ReceiptView
- media/AttachmentModalScreen
- AttachmentModalBaseContent
- routes
- report
- ReportAddAttachmentModalContent
- settings
- AboutPage
- ExitSurvey
- Preferences
- Profile
- Contacts
- CustomStatus
- PersonalDetails
- Report
- Rules
- Fields
- Security
- AddDelegate
- UpdateDelegateRole
- ValidateCodeForm
- LockAccount
- MergeAccounts
- TwoFactorAuth
- Subscription
- CardAuthenticationModal
- CardSection
- BillingBanner
- RequestEarlyCancellationMenuItem
- ExpensifyCodePage
- PaymentCard
- SubscriptionPlan
- AddMembersButton
- SaveWithExpensifyButton
- SubscriptionSettings
- SubscriptionSize
- subPages
- TaxExemptActions
- Troubleshoot
- Wallet
- BankAccountPurposePage/substeps
- EnableGlobalReimbursements
- Agreements
- BusinessInfo/subSteps
- Docusign
- ExpensifyCardPage
- InternationalDepositAccount
- PersonalInfo
- substeps
- substeps
- TravelCVVPage
- WalletPage
- signin
- LoginForm
- SAMLSignInPage
- SignInLoginContext
- SignInPageLayout
- ValidateCodeForm
- tasks
- wallet
- workspace
- accounting
- intacct/import
- reconciliation
- categories
- companyCards
- BankConnection
- WorkspaceCompanyCardsTable
- addNew
- assignCard
- distanceRates
- UnitSelector
- downgrade
- duplicate
- expensifyCard
- issueNew
- invoices
- members
- perDiem
- receiptPartners
- reports
- InitialListValueSelector
- rules
- MerchantRules
- tags
- taxes
- timeTracking
- travel
- upgrade
- workflows
- approvals
- selectors
- setup
- platformSetup
- telemetry
- styles
- utils
- types/onyx
- tests
- actions
- IOUTest
- connections
- e2e
- compare
- output
- measure
- nativeCommands
- server
- utils
- perf-test
- ui
- unit
- Charts
- Search
- __snapshots__
- hooks
- libs/Avatars/__snapshots__
- selectors
- utils/collections
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| 25 | + | |
23 | 26 | | |
24 | 27 | | |
25 | 28 | | |
| |||
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
| 34 | + | |
31 | 35 | | |
32 | 36 | | |
33 | | - | |
| 37 | + | |
34 | 38 | | |
35 | 39 | | |
| 40 | + | |
| 41 | + | |
36 | 42 | | |
37 | 43 | | |
38 | 44 | | |
| |||
52 | 58 | | |
53 | 59 | | |
54 | 60 | | |
55 | | - | |
56 | | - | |
57 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
58 | 65 | | |
59 | 66 | | |
| 67 | + | |
60 | 68 | | |
61 | 69 | | |
62 | 70 | | |
| |||
75 | 83 | | |
76 | 84 | | |
77 | 85 | | |
78 | | - | |
| 86 | + | |
79 | 87 | | |
80 | 88 | | |
81 | 89 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
24 | | - | |
| 26 | + | |
25 | 27 | | |
26 | | - | |
27 | | - | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
| 31 | + | |
| 32 | + | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
| |||
64 | 67 | | |
65 | 68 | | |
66 | 69 | | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
0 commit comments