Skip to content

Commit 67cab74

Browse files
narefyev91narefyev91
committed
Merge branch 'refs/heads/main' into feed-settings
# Conflicts: # src/languages/en.ts # src/languages/es.ts # src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
2 parents ad30ce2 + 5cbff0b commit 67cab74

File tree

74 files changed

+924
-684
lines changed

Some content is hidden

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

74 files changed

+924
-684
lines changed

‎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 1009002604
114-
versionName "9.0.26-4"
113+
versionCode 1009002700
114+
versionName "9.0.27-0"
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"

‎config/webpack/webpack.common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
123123
{from: 'node_modules/pdfjs-dist/cmaps/', to: 'cmaps/'},
124124
],
125125
}),
126-
new EnvironmentPlugin({JEST_WORKER_ID: null}),
126+
new EnvironmentPlugin({JEST_WORKER_ID: ''}),
127127
new IgnorePlugin({
128128
resourceRegExp: /^\.\/locale$/,
129129
contextRegExp: /moment$/,

‎docs/articles/expensify-classic/travel/Configure-travel-policy-and-preferences.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ To create or update a travel policy,
2121
2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
2222

2323
{% include info.html %}
24+
The Company name in Expensify Travel is the domain of the Expensify workspace billing owner
2425
A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
2526
{% include end-info.html %}
2627

‎docs/articles/new-expensify/travel/Configure-travel-policy-and-preferences.md

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ To create or update a travel policy,
9898
2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
9999

100100
{% include info.html %}
101+
The Company name in Expensify Travel is the domain of the Expensify workspace billing owner
101102
A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
102103
{% include end-info.html %}
103104

‎ios/NewExpensify/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>9.0.26</string>
22+
<string>9.0.27</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>9.0.26.4</string>
43+
<string>9.0.27.0</string>
4444
<key>FullStory</key>
4545
<dict>
4646
<key>OrgId</key>

‎ios/NewExpensifyTests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>9.0.26</string>
18+
<string>9.0.27</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>9.0.26.4</string>
22+
<string>9.0.27.0</string>
2323
</dict>
2424
</plist>

‎ios/NotificationServiceExtension/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.0.26</string>
14+
<string>9.0.27</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.26.4</string>
16+
<string>9.0.27.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/Podfile.lock

+49-5
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ PODS:
18401840
- ReactCommon/turbomodule/bridging
18411841
- ReactCommon/turbomodule/core
18421842
- Yoga
1843-
- react-native-quick-sqlite (8.0.6):
1843+
- react-native-quick-sqlite (8.1.0):
18441844
- DoubleConversion
18451845
- glog
18461846
- hermes-engine
@@ -2474,7 +2474,51 @@ PODS:
24742474
- ReactCommon/turbomodule/bridging
24752475
- ReactCommon/turbomodule/core
24762476
- Yoga
2477-
- RNReanimated (3.13.0):
2477+
- RNReanimated (3.15.1):
2478+
- DoubleConversion
2479+
- glog
2480+
- hermes-engine
2481+
- RCT-Folly (= 2024.01.01.00)
2482+
- RCTRequired
2483+
- RCTTypeSafety
2484+
- React-Core
2485+
- React-debug
2486+
- React-Fabric
2487+
- React-featureflags
2488+
- React-graphics
2489+
- React-ImageManager
2490+
- React-NativeModulesApple
2491+
- React-RCTFabric
2492+
- React-rendererdebug
2493+
- React-utils
2494+
- ReactCodegen
2495+
- ReactCommon/turbomodule/bridging
2496+
- ReactCommon/turbomodule/core
2497+
- RNReanimated/reanimated (= 3.15.1)
2498+
- RNReanimated/worklets (= 3.15.1)
2499+
- Yoga
2500+
- RNReanimated/reanimated (3.15.1):
2501+
- DoubleConversion
2502+
- glog
2503+
- hermes-engine
2504+
- RCT-Folly (= 2024.01.01.00)
2505+
- RCTRequired
2506+
- RCTTypeSafety
2507+
- React-Core
2508+
- React-debug
2509+
- React-Fabric
2510+
- React-featureflags
2511+
- React-graphics
2512+
- React-ImageManager
2513+
- React-NativeModulesApple
2514+
- React-RCTFabric
2515+
- React-rendererdebug
2516+
- React-utils
2517+
- ReactCodegen
2518+
- ReactCommon/turbomodule/bridging
2519+
- ReactCommon/turbomodule/core
2520+
- Yoga
2521+
- RNReanimated/worklets (3.15.1):
24782522
- DoubleConversion
24792523
- glog
24802524
- hermes-engine
@@ -3147,7 +3191,7 @@ SPEC CHECKSUMS:
31473191
react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d
31483192
react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5
31493193
react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0
3150-
react-native-quick-sqlite: cc2939134fbd404ac7d51d3dc8d69219eff242a8
3194+
react-native-quick-sqlite: 7c793c9f5834e756b336257a8d8b8239b7ceb451
31513195
react-native-release-profiler: 131ec5e4145d900b2be2a8d6641e2ce0dd784259
31523196
react-native-safe-area-context: 38fdd9b3c5561de7cabae64bd0cd2ce05d2768a1
31533197
react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688
@@ -3196,7 +3240,7 @@ SPEC CHECKSUMS:
31963240
rnmapbox-maps: 5ab6bfd249cd67262615153c648f8d809aab781c
31973241
RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
31983242
RNReactNativeHapticFeedback: a15b431d2903bc2eb3474ff8d9a05d3e67a70199
3199-
RNReanimated: 601912257776588e7c0543f8dea4ba6dd393e9d0
3243+
RNReanimated: 76901886830e1032f16bbf820153f7dc3f02d51d
32003244
RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
32013245
RNShare: a3c2fbbca5682530b65ff405b34c91dad1e22442
32023246
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
@@ -3208,7 +3252,7 @@ SPEC CHECKSUMS:
32083252
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
32093253
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
32103254
VisionCamera: c6c8aa4b028501fc87644550fbc35a537d4da3fb
3211-
Yoga: 2a45d7e59592db061217551fd3bbe2dd993817ae
3255+
Yoga: a1d7895431387402a674fd0d1c04ec85e87909b8
32123256

32133257
PODFILE CHECKSUM: e479ec84cb53e5fd463486d71dfee91708d3fd9a
32143258

‎jest/setup.ts

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable max-classes-per-file */
12
import '@shopify/flash-list/jestSetup';
23
import 'react-native-gesture-handler/jestSetup';
34
import type * as RNKeyboardController from 'react-native-keyboard-controller';
@@ -78,3 +79,22 @@ jest.mock('@src/libs/actions/Timing', () => ({
7879
start: jest.fn(),
7980
end: jest.fn(),
8081
}));
82+
83+
// This makes FlatList render synchronously for easier testing.
84+
jest.mock(
85+
'@react-native/virtualized-lists/Interaction/Batchinator',
86+
() =>
87+
class SyncBachinator {
88+
#callback: () => void;
89+
90+
constructor(callback: () => void) {
91+
this.#callback = callback;
92+
}
93+
94+
schedule() {
95+
this.#callback();
96+
}
97+
98+
dispose() {}
99+
},
100+
);

0 commit comments

Comments
 (0)