Commit c26d43b
committed
Merge branch 'main' of https://github.com/TaduJR/App into refactor-decompose-popover-menu
# Conflicts:
# Mobile-Expensify
# android/app/build.gradle
# ios/NewExpensify/Info.plist
# ios/NotificationServiceExtension/Info.plist
# ios/ShareViewController/Info.plist
# package-lock.json
# package.json
# tests/unit/inlineEditing/editableCellHooks.test.ts232 files changed
Lines changed: 6362 additions & 3008 deletions
File tree
- .github/workflows
- android/app
- assets/images/simple-illustrations
- config/eslint
- docs/articles/new-expensify
- connections/netsuite
- reports-and-expenses
- wallet-and-payments
- ios
- NewExpensify
- NotificationServiceExtension
- patches
- @shopify/flash-list
- react-native-onyx
- src
- CONST
- components
- ButtonWithDropdownMenu
- ConnectToZenefitsFlow
- Icon
- chunks
- MoneyReportHeaderPrimaryAction
- MoneyRequestConfirmationList
- ReportActionItem
- Search
- FilterComponents
- SearchList/ListItem
- hooks
- TransactionItemRow
- DataCells
- EditableCell
- hooks
- usePersonalDetailSearchSelector
- useSearchSelector
- languages
- libs
- API
- parameters
- Avatars
- OptionsListUtils
- PersonalDetailOptionsListUtils
- actions
- IOU
- types
- Policy
- Report
- connections
- telemetry
- pages
- inbox
- report
- ReportActionCompose
- StaticReportActionsPreview
- iou/request/step
- IOURequestStepDistanceGPS
- IOURequestStepReport/hooks
- confirmation
- settings
- Agents
- Fields
- Profile
- Avatar
- PersonalDetails
- Subscription/CardSection
- Wallet
- workspace
- WorkspaceMoreFeaturesPage
- distanceRates
- expensifyCard
- hr
- rooms
- travel
- styles
- utils
- types/onyx
- tests
- __mocks__
- actions
- IOU
- ui
- unit
- Search
- hooks
- inlineEditing
- pages/settings
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 | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
126 | 127 | | |
127 | | - | |
128 | | - | |
| 128 | + | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
160 | 160 | | |
161 | 161 | | |
162 | 162 | | |
| 163 | + | |
163 | 164 | | |
164 | | - | |
| 165 | + | |
165 | 166 | | |
166 | 167 | | |
167 | 168 | | |
| |||
Submodule Mobile-Expensify updated from fcbc411 to 5f5fbfb
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
114 | | - | |
115 | | - | |
| 114 | + | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
402 | 402 | | |
403 | 403 | | |
404 | 404 | | |
405 | | - | |
406 | | - | |
407 | | - | |
408 | | - | |
409 | | - | |
410 | 405 | | |
411 | 406 | | |
412 | 407 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
170 | 171 | | |
171 | 172 | | |
172 | 173 | | |
173 | | - | |
174 | | - | |
| 174 | + | |
| 175 | + | |
175 | 176 | | |
176 | 177 | | |
177 | 178 | | |
| |||
225 | 226 | | |
226 | 227 | | |
227 | 228 | | |
| 229 | + | |
228 | 230 | | |
229 | 231 | | |
230 | 232 | | |
| |||
234 | 236 | | |
235 | 237 | | |
236 | 238 | | |
237 | | - | |
| 239 | + | |
238 | 240 | | |
239 | 241 | | |
240 | 242 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
930 | 930 | | |
931 | 931 | | |
932 | 932 | | |
933 | | - | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
934 | 937 | | |
935 | 938 | | |
936 | 939 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| |||
0 commit comments