Skip to content

Commit 6e0a1ae

Browse files
committed
Merge branch 'main' into bump-react-native-localize
2 parents 6246cbf + 276a46a commit 6e0a1ae

147 files changed

Lines changed: 3781 additions & 936 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

__mocks__/react-native.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jest.doMock('react-native', () => {
4545
NativeModules: {
4646
...ReactNative.NativeModules,
4747
BootSplash: {
48-
hide: jest.fn(),
48+
hide: jest.fn().mockResolvedValue(undefined),
4949
logoSizeRatio: 1,
5050
navigationBarHeight: 0,
5151
},

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009022905
118-
versionName "9.2.29-5"
117+
versionCode 1009023000
118+
versionName "9.2.30-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ org.gradle.parallel=true
6262
patchedArtifacts.packageName=react-standalone
6363

6464
# Change this property to false if you want to use prebuilt react-native artifacts.
65-
patchedArtifacts.forceBuildFromSource=true
65+
patchedArtifacts.forceBuildFromSource=false

cspell.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,11 @@
759759
"مثال",
760760
"moveElemsAttrsToGroup",
761761
"removeHiddenElems",
762-
"moveGroupAttrsToElems"
762+
"moveGroupAttrsToElems",
763+
"Dtype",
764+
"Areport",
765+
"mple",
766+
"Selec"
763767
],
764768
"ignorePaths": [
765769
"src/languages/de.ts",

gradleUtils/PatchedArtifactsSettings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ settings.extensions.configure(PatchedArtifactsConfig) { config ->
132132

133133
if(config.version == null || config.packageName == null || config.githubUsername == null || config.githubToken == null) {
134134
config.buildFromSource = true
135-
ExpensiLog.lifecycle("No matching artifacts version found for ${config.packageName}. Building react-native from source.")
135+
ExpensiLog.error("No matching artifacts version found for ${config.packageName}. Building react-native from source.")
136136
}
137137
else {
138138
config.buildFromSource = false

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.2.29</string>
26+
<string>9.2.30</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.2.29.5</string>
47+
<string>9.2.30.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 2 additions & 2 deletions
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.2.29</string>
14+
<string>9.2.30</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.29.5</string>
16+
<string>9.2.30.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,7 +2830,7 @@ PODS:
28302830
- RNGoogleSignin (10.0.1):
28312831
- GoogleSignIn (~> 7.0)
28322832
- React-Core
2833-
- RNLiveMarkdown (0.1.304):
2833+
- RNLiveMarkdown (0.1.307):
28342834
- DoubleConversion
28352835
- glog
28362836
- hermes-engine
@@ -3898,7 +3898,7 @@ SPEC CHECKSUMS:
38983898
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
38993899
RNGestureHandler: 61d3e94abb866ee955563ddf073e405e3f541359
39003900
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
3901-
RNLiveMarkdown: 0a228fb9a8be4b5b463beeb3b272753a6f10e649
3901+
RNLiveMarkdown: ba5e9bd83b82d3994fb67608c7840a60ecc6e4fe
39023902
RNLocalize: e3a384870bd61fccfcc46de28089371907ed2e14
39033903
rnmapbox-maps: f3875edd847c82d770d1b57852b36d45b3ea8a01
39043904
RNNitroSQLite: e36968e81bbcab6c9e97a35e74ae34c7420d734c

ios/ShareViewController/Info.plist

Lines changed: 2 additions & 2 deletions
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.2.29</string>
14+
<string>9.2.30</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.29.5</string>
16+
<string>9.2.30.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)