Skip to content

Commit 19e3ebc

Browse files
committed
Merge branch 'main' into Migrate-rnef-to-rock
2 parents 5b6dbda + 2028515 commit 19e3ebc

708 files changed

Lines changed: 44286 additions & 3585 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build Android
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build iOS
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ src/libs/SearchParser/autocompleteParser.js
2626

2727
# Disable prettier in the submodule
2828
Mobile-Expensify
29+
modules/group-ib-fp

Mobile-Expensify

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#### Additional Reading
2727
* [Application Philosophy](contributingGuides/philosophies/INDEX.md)
2828
* [API Details](contributingGuides/API.md)
29-
* [Offline First](contributingGuides/OFFLINE_UX.md)
29+
* [Offline First](contributingGuides/philosophies/OFFLINE.md)
3030
* [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
3131
* [Expensify Code of Conduct](CODE_OF_CONDUCT.md)
3232
* [Contributor License Agreement](CLA.md)
@@ -622,7 +622,7 @@ This application is built with the following principles.
622622
6. Go to 1
623623
![New Expensify Data Flow Chart](/contributingGuides/data_flow.png)
624624
1. **Offline first**
625-
- Be sure to read [OFFLINE_UX.md](contributingGuides/OFFLINE_UX.md)!
625+
- Be sure to read [OFFLINE.md](contributingGuides/philosophies/OFFLINE.md)!
626626
- All data that is brought into the app and is necessary to display the app when offline should be stored on disk in persistent storage (eg. localStorage on browser platforms). [AsyncStorage](https://reactnative.dev/docs/asyncstorage) is a cross-platform abstraction layer that is used to access persistent storage.
627627
- All data that is displayed, comes from persistent storage.
628628
1. **UI Binds to data on disk**

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009019900
118-
versionName "9.1.99-0"
117+
versionCode 1009020001
118+
versionName "9.2.0-1"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

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

0 commit comments

Comments
 (0)