Fix conflicts

Author: yuwenmemon

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030918
-        versionName "1.3.9-18"
+        versionCode 1001031102
+        versionName "1.3.11-2"
     }
 
     splits {

docs/articles/other/Referral-Program.md

@@ -14,7 +14,7 @@ As a thank you, every time you bring a new user into the platform who directly o
 
 1. Submit a report or invoice, or share your referral link with anyone you know who is spending too much time on expenses, or works at a company that could benefit from using Expensify. 
 
-2. You’ll get $250 for any referred business that commits to an annual subscription and makes two monthly payments.
+2. You’ll get $250 for any referred business that commits to an annual subscription, has 2 or more active users, and makes two monthly payments.
 
 That’s right! You can refer anyone working at any company you know. 
 
@@ -42,6 +42,8 @@ While our referral payouts are in USD, you will be able to get paid via a Wise B
 
 - **My referral wasn’t counted! How can I appeal?**
 
+Expensify reserves the right to modify the terms of the referral program at any time, and pays out referral bonuses for eligible companies at its own discretion.
+
 Please send a message to [email protected] with the billing owner of the company you have referred and our team will review the referral and get back to you.
 
 - **Where can I find my referral link?**

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.9</string>
+	<string>1.3.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.9.18</string>
+	<string>1.3.11.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.9</string>
+	<string>1.3.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.9.18</string>
+	<string>1.3.11.2</string>
 </dict>
 </plist>

jest/setup.js

@@ -9,9 +9,10 @@ reanimatedJestUtils.setUpTests();
 // https://reactnavigation.org/docs/testing/#mocking-native-modules
 jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
 
-// We have to mock the SQLiteStorage provider because it uses the native module SQLiteStorage, which is not available in jest.
-// Mocking this file in __mocks__ does not work because jest doesn't support mocking files that are not directly used in the testing project
-jest.mock('react-native-onyx/lib/storage/providers/SQLiteStorage', () => require('react-native-onyx/lib/storage/__mocks__'));
+// Mock react-native-onyx storage layer because the SQLite storage layer doesn't work in jest.
+// Mocking this file in __mocks__ does not work because jest doesn't support mocking files that are not directly used in the testing project,
+// and we only want to mock the storage layer, not the whole Onyx module.
+jest.mock('react-native-onyx/lib/storage', () => require('react-native-onyx/lib/storage/__mocks__'));
 
 // Turn off the console logs for timing events. They are not relevant for unit tests and create a lot of noise
 jest.spyOn(console, 'debug').mockImplementation((...params) => {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.9-18",
+  "version": "1.3.11-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -44,10 +44,11 @@
   },
   "dependencies": {
     "@expensify/react-native-web": "0.18.15",
-    "@formatjs/intl-getcanonicallocales": "^1.5.8",
-    "@formatjs/intl-locale": "^2.4.21",
-    "@formatjs/intl-numberformat": "^6.2.5",
-    "@formatjs/intl-pluralrules": "^4.0.13",
+    "@formatjs/intl-getcanonicallocales": "^2.2.0",
+    "@formatjs/intl-listformat": "^7.2.2",
+    "@formatjs/intl-locale": "^3.3.0",
+    "@formatjs/intl-numberformat": "^8.5.0",
+    "@formatjs/intl-pluralrules": "^5.2.2",
     "@gorhom/portal": "^1.0.14",
     "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#c5f654fc9d0ad7cc5b89d50b34ecf8b0e3f4d050",
     "@onfido/react-native-sdk": "7.4.0",
@@ -72,7 +73,7 @@
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#3cdaa947fe77016206c15e523017cd50678f2359",
+    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#cb5836992710d910ab64f33895052074abdaa357",
     "fbjs": "^3.0.2",
     "html-entities": "^1.3.1",
     "htmlparser2": "^7.2.0",
@@ -109,7 +110,7 @@
     "react-native-key-command": "^1.0.0",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "^1.0.41",
+    "react-native-onyx": "1.0.41",
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^4.0.0",
     "react-native-permissions": "^3.0.1",