Skip to content

Commit d08e7e9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jakubstec/domains/security-group-details-page-group-permissions2
2 parents 4b93723 + 17bac0c commit d08e7e9

524 files changed

Lines changed: 9220 additions & 5473 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 1009036601
115-
versionName "9.3.66-1"
114+
versionCode 1009036606
115+
versionName "9.3.66-6"
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"

config/eslint/eslint.seatbelt.tsv

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,12 @@
126126
"../../src/components/Search/FilterComponents/DateFilterBase.tsx" "react-hooks/set-state-in-effect" 1
127127
"../../src/components/Search/FilterDropdowns/CardSelectPopup.tsx" "react-hooks/set-state-in-effect" 1
128128
"../../src/components/Search/FilterDropdowns/UserSelectPopup.tsx" "react-hooks/set-state-in-effect" 1
129-
"../../src/components/Search/SearchList/BaseSearchList/index.tsx" "react-hooks/refs" 4
130129
"../../src/components/Search/SearchPageHeader/useSearchPageInput.tsx" "react-hooks/set-state-in-effect" 2
131130
"../../src/components/Search/SearchSingleSelectionPicker.tsx" "react-hooks/set-state-in-effect" 1
132131
"../../src/components/Search/index.tsx" "react-hooks/exhaustive-deps" 1
133132
"../../src/components/Search/index.tsx" "react-hooks/preserve-manual-memoization" 2
134133
"../../src/components/Search/index.tsx" "react-hooks/refs" 30
135134
"../../src/components/Search/index.tsx" "react-hooks/set-state-in-effect" 2
136-
"../../src/components/SelectionList/ListItem/TravelDomainListItem.tsx" "no-restricted-syntax" 1
137-
"../../src/components/SelectionList/ListItem/UserSelectionListItem.tsx" "no-restricted-syntax" 1
138135
"../../src/components/SidePanel/SidePanelOverlay.tsx" "no-restricted-syntax" 1
139136
"../../src/components/SignInButtons/IconButton.tsx" "no-restricted-syntax" 1
140137
"../../src/components/SingleOptionSelector.tsx" "no-restricted-syntax" 1
@@ -225,7 +222,6 @@
225222
"../../src/libs/OptionsListUtils/index.ts" "rulesdir/no-onyx-connect" 3
226223
"../../src/libs/Parser.ts" "rulesdir/no-onyx-connect" 2
227224
"../../src/libs/PersonalDetailsUtils.ts" "rulesdir/no-onyx-connect" 2
228-
"../../src/libs/PolicyUtils.ts" "rulesdir/no-onyx-connect" 1
229225
"../../src/libs/ReceiptUploadRetryHandler/handleFileRetry.ts" "no-restricted-syntax" 2
230226
"../../src/libs/ReportActionsUtils.ts" "rulesdir/no-onyx-connect" 3
231227
"../../src/libs/ReportUtils.ts" "rulesdir/no-onyx-connect" 17
@@ -351,13 +347,8 @@
351347
"../../src/pages/RoomMembersPage.tsx" "react-hooks/set-state-in-effect" 3
352348
"../../src/pages/ScheduleCall/ScheduleCallPage.tsx" "react-hooks/preserve-manual-memoization" 1
353349
"../../src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx" "react-hooks/set-state-in-effect" 1
354-
"../../src/pages/Search/SearchPage.tsx" "react-hooks/refs" 31
355350
"../../src/pages/Search/SearchPage.tsx" "react-hooks/set-state-in-effect" 1
356-
"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/immutability" 2
357-
"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/preserve-manual-memoization" 1
358351
"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/refs" 12
359-
"../../src/pages/TransactionMerge/MergeFieldReview.tsx" "no-restricted-syntax" 1
360-
"../../src/pages/TransactionMerge/TransactionMergeReceipts.tsx" "no-restricted-syntax" 1
361352
"../../src/pages/Travel/TravelUpgrade.tsx" "react-hooks/set-state-in-effect" 1
362353
"../../src/pages/ValidateLoginPage/index.website.tsx" "react-hooks/set-state-in-effect" 1
363354
"../../src/pages/inbox/ReportNavigateAwayHandler.tsx" "react-hooks/exhaustive-deps" 1
@@ -407,7 +398,6 @@
407398
"../../src/pages/settings/Profile/CustomStatus/StatusPage.tsx" "react-hooks/set-state-in-effect" 1
408399
"../../src/pages/settings/Profile/PronounsPage.tsx" "react-hooks/set-state-in-effect" 1
409400
"../../src/pages/settings/Subscription/CardAuthenticationModal/index.tsx" "react-hooks/set-state-in-effect" 1
410-
"../../src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx" "no-restricted-syntax" 1
411401
"../../src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx" "no-restricted-syntax" 1
412402
"../../src/pages/settings/Subscription/SubscriptionPlan/ComparePlansModal.tsx" "react-hooks/set-state-in-effect" 1
413403
"../../src/pages/settings/Wallet/InternationalDepositAccount/PersonalInfo/substeps/AddressStep.tsx" "react-hooks/set-state-in-effect" 1

contributingGuides/SELECTION_LIST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ There are two main components:
3939
```tsx
4040
<SelectionList
4141
data={options}
42-
ListItem={RadioListItem}
42+
ListItem={SingleSelectListItem}
4343
onSelectRow={(item) => {
4444
setSelectedOption(item.keyForList);
4545
Navigation.goBack();

contributingGuides/STYLE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ The correct approach is avoid using `ScrollView`. You can add props like `listHe
12341234
<Text>Header Content</Text>
12351235
<SelectionList
12361236
sections={[{data}]}
1237-
ListItem={RadioListItem}
1237+
ListItem={SingleSelectListItem}
12381238
onSelectRow={handleSelect}
12391239
/>
12401240
<Button title="Submit" onPress={handleSubmit} />
@@ -1248,7 +1248,7 @@ The correct approach is to use the list component's built-in header and footer p
12481248
```jsx
12491249
<SelectionList
12501250
sections={[{item}]}
1251-
ListItem={RadioListItem}
1251+
ListItem={SingleSelectListItem}
12521252
onSelectRow={handleSelect}
12531253
listHeaderComponent={<Text>Header Content</Text>}
12541254
listFooterComponent={<Button title="Submit" onPress={handleSubmit} />}
@@ -1261,7 +1261,7 @@ The correct approach is to use the list component's built-in header and footer p
12611261
<Text>Header Content</Text>
12621262
<FlashList
12631263
data={data}
1264-
renderItem={RadioListItem}
1264+
renderItem={SingleSelectListItem}
12651265
estimatedItemSize={variables.optionRowHeight}
12661266
keyExtractor={keyExtractor}
12671267
/>

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.66.1</string>
47+
<string>9.3.66.6</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.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.66.1</string>
16+
<string>9.3.66.6</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.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.66.1</string>
16+
<string>9.3.66.6</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.66-1",
3+
"version": "9.3.66-6",
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.",

0 commit comments

Comments
 (0)