Merge branch 'main' of https://github.com/Expensify/App into mkzie2-issue/68656

Author: mkzie2

.eslintignore

@@ -17,3 +17,4 @@ help/_scripts/**
 modules/ExpensifyNitroUtils/nitrogen/**
 Mobile-Expensify/**
 vendor
+modules/group-ib-fp/**

.github/CODEOWNERS

@@ -1,6 +1,9 @@
 # Every PR gets a review from an internal Expensify engineer
 * @Expensify/pullerbear
 
-# Assign the Design team to review changes to our styles & assets
-src/styles/ @Expensify/design @Expensify/pullerbear
-assets/ @Expensify/design @Expensify/pullerbear
+# PRs that touch the front end source code, get an additional review from the product-pr team
+src/ @Expensify/product-pr @Expensify/pullerbear
+
+# PRs that touch the front end style or assets, get an additional review from the Design team
+src/styles/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear
+assets/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear

.github/workflows/remote-build-android.yml

@@ -3,7 +3,7 @@ name: Remote Build Android
 on:
   workflow_dispatch:
   push:
-    branches-ignore: [staging, production]
+    branches-ignore: [staging, production, cherry-pick-*]
     paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:

.github/workflows/remote-build-ios.yml

@@ -3,7 +3,7 @@ name: Remote Build iOS
 on:
   workflow_dispatch:
   push:
-    branches-ignore: [staging, production]
+    branches-ignore: [staging, production, cherry-pick-*]
     paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:

.prettierignore

@@ -17,6 +17,8 @@ package-lock.json
 *.scss
 *.md
 *.markdown
+# We need to ignore index.js because it should always have plyfill on top of imports and we don't want prettier to sort them
+index.js
 # We need to modify the import here specifically, hence we disable prettier to get rid of the sorted imports
 src/libs/E2E/reactNativeLaunchingTest.ts
 
@@ -26,3 +28,4 @@ src/libs/SearchParser/autocompleteParser.js
 
 # Disable prettier in the submodule
 Mobile-Expensify
+modules/group-ib-fp

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009019905
-        versionName "9.1.99-5"
+        versionCode 1009020100
+        versionName "9.2.1-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -15,6 +15,11 @@ project(':react-native-plaid-link-sdk').projectDir = new File(rootProject.projec
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
+include ':gibsdk'
+project(':gibsdk').projectDir = new File(rootProject.projectDir, '../node_modules/group-ib-fp/android/gibsdk')
+include ':package'
+project(':package').projectDir = new File(rootProject.projectDir, '../node_modules/group-ib-fp/android/package')
+
 if(settings.extensions.patchedArtifacts.buildFromSource) {
     includeBuild('../node_modules/react-native') {
         dependencySubstitution {