Merge remote-tracking branch 'upstream/main' into 32594-update-style-…

…for-violations # Conflicts: # src/components/ReportActionItem/MoneyRequestView.tsx
Expensify · Feb 12, 2024 · 766ccf3 · 766ccf3
2 parents 7eb9560 + 9c8d7d2
commit 766ccf3
Show file tree

Hide file tree

Showing 104 changed files with 826 additions and 4,256 deletions.
diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js
diff --git a/__mocks__/fileMock.ts b/__mocks__/fileMock.ts
@@ -0,0 +1,3 @@
+const fileMock = 'test-file-stub';
+
+export default fileMock;
diff --git a/__mocks__/react-native-config.js b/__mocks__/react-native-config.js
diff --git a/__mocks__/react-native-config.ts b/__mocks__/react-native-config.ts
@@ -0,0 +1,8 @@
+import dotenv from 'dotenv';
+import path from 'path';
+
+type ReactNativeConfigMock = dotenv.DotenvParseOutput | undefined;
+
+const reactNativeConfigMock: ReactNativeConfigMock = dotenv.config({path: path.resolve('./.env.example')}).parsed;
+
+export default reactNativeConfigMock;
diff --git a/__mocks__/react-native-image-picker.js b/__mocks__/react-native-image-picker.js
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043904
-        versionName "1.4.39-4"
+        versionCode 1001044000
+        versionName "1.4.40-0"
     }
 
     flavorDimensions "default"

diff --git a/android/app/src/main/res/raw/attention.mp3 b/android/app/src/main/res/raw/attention.mp3
diff --git a/android/app/src/main/res/raw/done.mp3 b/android/app/src/main/res/raw/done.mp3
diff --git a/android/app/src/main/res/raw/receive.mp3 b/android/app/src/main/res/raw/receive.mp3
diff --git a/android/app/src/main/res/raw/success.mp3 b/android/app/src/main/res/raw/success.mp3
diff --git a/assets/images/chatbubble-add.svg b/assets/images/chatbubble-add.svg
diff --git a/assets/images/chatbubble-unread.svg b/assets/images/chatbubble-unread.svg
diff --git a/assets/images/home.svg b/assets/images/home.svg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const fileMock = 'test-file-stub';

		export default fileMock;