Skip to content

Commit 862884d

Browse files
committed
Merge branch 'main' into feat/reanimated-year-picker-modal
2 parents 5f0ef97 + f660f73 commit 862884d

730 files changed

Lines changed: 4396 additions & 3807 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.

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ const restrictedImportPaths = [
100100
name: 'react-native-animatable',
101101
message: "Please use 'react-native-reanimated' instead.",
102102
},
103+
{
104+
name: 'react-native-onyx',
105+
importNames: ['useOnyx'],
106+
message: "Please use '@hooks/useOnyx' instead.",
107+
},
103108
];
104109

105110
const restrictedImportPatterns = [

Mobile-Expensify

__mocks__/react-native-onyx.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/* eslint-disable rulesdir/prefer-onyx-connect-in-libs */
77
import type {ConnectOptions, OnyxKey} from 'react-native-onyx';
8+
// eslint-disable-next-line no-restricted-imports
89
import Onyx, {useOnyx, withOnyx} from 'react-native-onyx';
910

1011
let connectCallbackDelay = 0;

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 1009017409
118-
versionName "9.1.74-9"
117+
versionCode 1009017604
118+
versionName "9.1.76-4"
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"

assets/images/integrationicons/export/microsoft-dynamics-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/netsuite-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/netsuite-oracle-icon.svg

Lines changed: 0 additions & 30 deletions
This file was deleted.

assets/images/integrationicons/export/oracle-icon.svg

Lines changed: 0 additions & 28 deletions
This file was deleted.

assets/images/integrationicons/export/qbo-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/sage-intacct-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)