Merge branch 'main' into fix-16499

.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended'],
+    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended'],
+    plugins: ['react-hooks'],
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', '.git/**'],
     env: {

.github/actions/composite/setupNode/action.yml

@@ -12,6 +12,6 @@ runs:
     - name: Install node packages
       uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
       with:
-        timeout_minutes: 10
-        max_attempts: 5
+        timeout_minutes: 30
+        max_attempts: 3
         command: npm ci

.github/workflows/platformDeploy.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
-  DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
 
 jobs:
   validateActor:

.github/workflows/testBuild.yml

@@ -11,7 +11,7 @@ on:
     branches: ['*ci-test/**']
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
 
 jobs:
   validateActor:

__mocks__/@react-native-camera-roll/camera-roll.js

@@ -0,0 +1,5 @@
+export default {
+    CameraRoll: {
+        save: jest.fn(),
+    },
+};

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

@@ -0,0 +1,40 @@
+const EventType = {
+    NotificationResponse: 'notificationResponse',
+    PushReceived: 'pushReceived',
+};
+
+const iOS = {
+    ForegroundPresentationOption: {
+        Alert: 'alert',
+        Sound: 'sound',
+        Badge: 'badge',
+    },
+};
+
+const Airship = {
+    setUserNotificationsEnabled: jest.fn(),
+    addListener: jest.fn(),
+    removeAllListeners: jest.fn(),
+    setBadgeNumber: jest.fn(),
+    push: {
+        iOS: {
+            setBadgeNumber: jest.fn(),
+            setForegroundPresentationOptions: jest.fn(),
+        },
+        enableUserNotifications: () => Promise.resolve(false),
+        clearNotifications: jest.fn(),
+        getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false}),
+    },
+    contact: {
+        identify: jest.fn(),
+        getNamedUserId: jest.fn(),
+        reset: jest.fn(),
+    },
+};
+
+export default Airship;
+
+export {
+    EventType,
+    iOS,
+};

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001028900
-        versionName "1.2.89-0"
+        versionCode 1001029202
+        versionName "1.2.92-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
@@ -332,6 +332,10 @@ dependencies {
 
     // Plaid SDK
     implementation project(':react-native-plaid-link-sdk')
+
+    // Fixes a version conflict between airship and react-native-plaid-link-sdk
+    implementation "androidx.work:work-runtime-ktx:2.8.0"
+
     // This okhttp3 dependency prevents the app from crashing - See https://github.com/plaid/react-native-plaid-link-sdk/issues/74#issuecomment-648435002
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.+"
 }

android/build.gradle

@@ -3,8 +3,8 @@
 buildscript {
     ext {
         minSdkVersion = 21
-        compileSdkVersion = 32
-        targetSdkVersion = 32
+        compileSdkVersion = 33
+        targetSdkVersion = 33
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64

config/proxyConfig.js

@@ -0,0 +1,9 @@
+/**
+ * These are the base API roots used to send requests to the proxy.
+ * We only specify for staging URLs as API requests are sent to the production
+ * servers by default.
+ */
+module.exports = {
+    STAGING: '/staging/',
+    STAGING_SECURE: '/staging-secure/',
+};

config/webpack/webpack.dev.js

@@ -21,6 +21,7 @@ module.exports = (env = {}) => portfinder.getPortPromise({port: BASE_PORT})
             : {
                 proxy: {
                     '/api': 'http://[::1]:9000',
+                    '/staging': 'http://[::1]:9000',
                     '/chat-attachments': 'http://[::1]:9000',
                 },
             };

contributingGuides/CONTRIBUTING.md

@@ -170,3 +170,10 @@ Additionally if you want to discuss an idea with the open source community witho
 #### Important note about JavaScript Style
 - Read our official [JavaScript and React style guide](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md). Please refer to our Style Guide before asking for a review.
 - We have nothing against Prettier or any other automatic style fixers, but we generally don't use them here at Expensify. Do not use Prettier. The style changes these tools enforce don't always align with the ones we recommend and require in our eslint configs and can result in unnecessary changes for our reviewers. Ignoring this advice will ultimately make your changes take longer to review as we will ask you to undo any style changes that are not related to the important changes you are making.
+
+#### For external agencies that Expensify partners with
+Follow all the above above steps and processes. When you find a job you'd like to work on:
+- Post “I’m from [agency], I’d like to work on this job”
+  - If no proposals have been submitted by other contributors, BugZero (BZ) team member or an internal engineer will assign the issue to you. 
+  - If there are existing proposals, BZ will put the issue on hold. Contributor+ (C+) will review the existing proposals.  If a contributor’s proposal is accepted then contributor will be assigned to the issue.  If not the issue will be assigned to the agency-employee. 
+- Once assigned follow the steps [here](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#propose-a-solution-for-the-job) to submit your proposal