Skip to content

Commit 640839b

Browse files
committed
Merge branch 'main' into feature/useOnyx-wrapper
2 parents e48512a + 5b2b9c6 commit 640839b

178 files changed

Lines changed: 2872 additions & 2084 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.

.github/workflows/reassurePerformanceTests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@ jobs:
4848
BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
4949
git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
5050
git switch "$BASELINE_BRANCH"
51+
cd Mobile-Expensify
52+
git checkout "$(git rev-parse HEAD)"
53+
cd ..
54+
git add Mobile-Expensify
5155
npm install --force || (rm -rf node_modules && npm install --force)
5256
NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
5357
git switch --force --detach -
58+
cd Mobile-Expensify
59+
git checkout "$(git rev-parse HEAD)"
60+
cd ..
61+
git add Mobile-Expensify
5462
git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
5563
git checkout --ours .
5664
npm install --force || (rm -rf node_modules && npm install --force)

Mobile-Expensify

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ enum EventType {
66
PushReceived = 'com.airship.push_received',
77
}
88

9-
// eslint-disable-next-line no-restricted-syntax
10-
enum PermissionStatus {
11-
Granted = 'granted',
12-
Denied = 'denied',
13-
NotDetermined = 'not_determined',
14-
}
15-
169
// eslint-disable-next-line @typescript-eslint/no-namespace
1710
namespace iOS {
1811
/**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
7871

7972
export default Airship;
8073

81-
export {EventType, iOS, PermissionStatus};
74+
export {EventType, iOS};

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 1009017403
118-
versionName "9.1.74-3"
117+
versionCode 1009017409
118+
versionName "9.1.74-9"
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"
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 30 additions & 0 deletions
Loading
Lines changed: 28 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)