Skip to content

Commit 54d5df0

Browse files
committed
Merge branch 'upstream/main' into feat/optimize-bundle-flatlist-merkle-onnx and resolve conflicts
2 parents cddaa3b + a1f0795 commit 54d5df0

902 files changed

Lines changed: 214076 additions & 7259 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.

.detoxrc.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = {
77
args: {
88
$0: 'jest',
99
config: 'e2e/jest.config.js',
10+
maxWorkers: process.env.E2E_MAX_WORKERS || 1,
1011
},
1112
jest: {
1213
setupTimeout: 120000,
@@ -17,13 +18,13 @@ module.exports = {
1718
type: 'ios.app',
1819
binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/SubTrackr.app',
1920
build:
20-
'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
21+
'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
2122
},
2223
'ios.release': {
2324
type: 'ios.app',
2425
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/SubTrackr.app',
2526
build:
26-
'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
27+
'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
2728
},
2829
'android.debug': {
2930
type: 'android.apk',
@@ -83,4 +84,28 @@ module.exports = {
8384
app: 'android.release',
8485
},
8586
},
87+
behavior: {
88+
init: {
89+
exposeGlobals: true,
90+
reinstallApp: true,
91+
},
92+
cleanup: {
93+
shutdownDevice: false,
94+
},
95+
},
96+
artifacts: {
97+
rootDir: 'artifacts',
98+
plugins: {
99+
log: { enabled: true },
100+
screenshot: {
101+
enabled: true,
102+
shouldTakeAutomaticSnapshots: false,
103+
keepOnlyFailedTestsArtifacts: false,
104+
},
105+
video: {
106+
enabled: true,
107+
keepOnlyFailedTestsArtifacts: true,
108+
},
109+
},
110+
},
86111
};

.eslintrc.json

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,47 @@
1111
},
1212
"rules": {
1313
"prettier/prettier": "error",
14-
"@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
14+
"@typescript-eslint/no-unused-vars": [
15+
"error",
16+
{
17+
"argsIgnorePattern": "^_",
18+
"varsIgnorePattern": "^_",
19+
"caughtErrorsIgnorePattern": "^_",
20+
"destructuredArrayIgnorePattern": "^_"
21+
}
22+
],
1523
"@typescript-eslint/explicit-function-return-type": "off",
1624
"@typescript-eslint/no-explicit-any": "warn",
17-
"no-console": ["warn", { "allow": ["warn", "error"] }]
25+
"no-console": ["warn", { "allow": ["warn", "error"] }],
26+
"import/no-unresolved": [
27+
"error",
28+
{
29+
"ignore": [
30+
"@sentry/react-native",
31+
"bcryptjs",
32+
"expo-image",
33+
"expo-linking",
34+
"expo-local-authentication",
35+
"react-native-performance",
36+
"../../backend/services/shared/monitoring"
37+
]
38+
}
39+
]
1840
},
1941
"ignorePatterns": [
2042
"node_modules/",
2143
"dist/",
2244
"android/",
2345
"ios/",
2446
".expo/",
25-
"src/contracts/types/"
47+
"src/contracts/types/",
48+
"app/",
49+
"backend/",
50+
"acbu-backend/",
51+
"src/animations/",
52+
"stellarlend/",
53+
"stellarlend-pr282/",
54+
"vscode-extension/"
2655
],
2756
"settings": {
2857
"import/resolver": {

.github/corpus/pricing/max_price

18 Bytes
Binary file not shown.

.github/corpus/pricing/min_price

18 Bytes
Binary file not shown.
18 Bytes
Binary file not shown.

.github/corpus/pricing/zero_price

18 Bytes
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dddddddddddddddddddddddddddddddd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

18 Bytes
Binary file not shown.
18 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)