Merge branch 'main' into maddylewis-patch-4

.github/actions/javascript/bumpVersion/index.js

@@ -173,8 +173,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -978,8 +978,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -921,8 +921,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {

.github/actions/javascript/getPreviousVersion/index.js

@@ -74,8 +74,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {

.github/libs/versionUpdater.js

@@ -65,8 +65,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {

.github/workflows/e2ePerformanceTests.yml

@@ -212,7 +212,7 @@ jobs:
           status: custom
           custom_payload: |
             {
-              channel: '#expensify-margelo',
+              channel: '#e2e-announce',
               attachments: [{
                 color: 'danger',
                 text: `💥 ${process.env.AS_REPO} E2E Test run failed failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 💥`,

.gitignore

@@ -113,6 +113,11 @@ tsconfig.tsbuildinfo
 .yalc
 yalc.lock
 
+# Expo
+.expo
+dist/
+web-build/
+
 # Local https certificate/key
 config/webpack/*.pem
 

README.md

@@ -70,6 +70,8 @@ For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-t
 * To run a on a **Development Simulator**: `npm run ios`
 * Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile
 
+If you want to run the app on an actual physical iOS device, please follow the instructions [here](https://github.com/Expensify/App/blob/docs/how-to-build-app-on-physcial-device/contributingGuides/HOW_TO_BUILD_APP_ON_PHYSICAL_IOS_DEVICE.md).
+
 ## Running the Android app 🤖
 * Before installing Android dependencies, you need to obtain a token from Mapbox to download their SDKs. Please run `npm run configure-mapbox` and follow the instructions. If you already did this step for iOS, there is no need to repeat this step.
 * Go through the official React-Native instructions on [this page](https://reactnative.dev/docs/environment-setup?guide=native&platform=android) to start running the app on android.

__mocks__/@ua/react-native-airship.ts

@@ -0,0 +1,53 @@
+import type {AirshipContact, AirshipPush, AirshipPushAndroid, AirshipPushIOS, AirshipRoot} from '@ua/react-native-airship';
+import {EventType as AirshipEventType, iOS as AirshipIOS} from '@ua/react-native-airship';
+
+const EventType: Partial<typeof AirshipEventType> = {
+    NotificationResponse: AirshipEventType.NotificationResponse,
+    PushReceived: AirshipEventType.PushReceived,
+};
+
+const iOS: Partial<typeof AirshipIOS> = {
+    ForegroundPresentationOption: {
+        Sound: AirshipIOS.ForegroundPresentationOption.Sound,
+        Badge: AirshipIOS.ForegroundPresentationOption.Badge,
+        Banner: AirshipIOS.ForegroundPresentationOption.Banner,
+        List: AirshipIOS.ForegroundPresentationOption.List,
+    },
+};
+
+const pushIOS: AirshipPushIOS = jest.fn().mockImplementation(() => ({
+    setBadgeNumber: jest.fn(),
+    setForegroundPresentationOptions: jest.fn(),
+    setForegroundPresentationOptionsCallback: jest.fn(),
+}))();
+
+const pushAndroid: AirshipPushAndroid = jest.fn().mockImplementation(() => ({
+    setForegroundDisplayPredicate: jest.fn(),
+}))();
+
+const push: AirshipPush = jest.fn().mockImplementation(() => ({
+    iOS: pushIOS,
+    android: pushAndroid,
+    enableUserNotifications: () => Promise.resolve(false),
+    clearNotifications: jest.fn(),
+    getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false, airshipEnabled: false}),
+    getActiveNotifications: () => Promise.resolve([]),
+}))();
+
+const contact: AirshipContact = jest.fn().mockImplementation(() => ({
+    identify: jest.fn(),
+    getNamedUserId: () => Promise.resolve(undefined),
+    reset: jest.fn(),
+    module: jest.fn(),
+}))();
+
+const Airship: Partial<AirshipRoot> = {
+    addListener: jest.fn(),
+    removeAllListeners: jest.fn(),
+    push,
+    contact,
+};
+
+export default Airship;
+
+export {EventType, iOS};