Skip to content

Commit b7aae35

Browse files
committed
Merge branch 'main' of https://github.com/Expensify/App into mkzie2-issue/68135
2 parents 2a9f657 + 6517be6 commit b7aae35

522 files changed

Lines changed: 44295 additions & 4034 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ help/_scripts/**
1717
modules/ExpensifyNitroUtils/nitrogen/**
1818
Mobile-Expensify/**
1919
vendor
20+
modules/group-ib-fp/**

.github/CODEOWNERS

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Every PR gets a review from an internal Expensify engineer
22
* @Expensify/pullerbear
33

4-
# Assign the Design team to review changes to our styles & assets
5-
src/styles/ @Expensify/design @Expensify/pullerbear
6-
assets/ @Expensify/design @Expensify/pullerbear
4+
# PRs that touch the front end source code, get an additional review from the product-pr team
5+
src/ @Expensify/product-pr @Expensify/pullerbear
6+
7+
# PRs that touch the front end style or assets, get an additional review from the Design team
8+
src/styles/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear
9+
assets/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ package-lock.json
1717
*.scss
1818
*.md
1919
*.markdown
20+
# 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
21+
index.js
2022
# We need to modify the import here specifically, hence we disable prettier to get rid of the sorted imports
2123
src/libs/E2E/reactNativeLaunchingTest.ts
2224

@@ -26,3 +28,4 @@ src/libs/SearchParser/autocompleteParser.js
2628

2729
# Disable prettier in the submodule
2830
Mobile-Expensify
31+
modules/group-ib-fp

Mobile-Expensify

android/settings.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ project(':react-native-plaid-link-sdk').projectDir = new File(rootProject.projec
1515
include ':app'
1616
includeBuild('../node_modules/@react-native/gradle-plugin')
1717

18+
include ':gibsdk'
19+
project(':gibsdk').projectDir = new File(rootProject.projectDir, '../node_modules/group-ib-fp/android/gibsdk')
20+
include ':package'
21+
project(':package').projectDir = new File(rootProject.projectDir, '../node_modules/group-ib-fp/android/package')
22+
1823
if(settings.extensions.patchedArtifacts.buildFromSource) {
1924
includeBuild('../node_modules/react-native') {
2025
dependencySubstitution {
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)