Skip to content

Commit cef198d

Browse files
committed
Merge branch 'main' into change_workspace
2 parents 8127e1f + ed7d994 commit cef198d

427 files changed

Lines changed: 7351 additions & 4181 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.changed.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module.exports = {
88
'deprecation/deprecation': 'error',
99
'rulesdir/no-default-id-values': 'error',
1010
'rulesdir/provide-canBeMissing-in-useOnyx': 'error',
11+
'rulesdir/no-unstable-hook-defaults': 'error',
1112
'no-restricted-syntax': [
1213
'error',
1314
{

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ module.exports = {
219219
'es/no-optional-chaining': 'off',
220220
'deprecation/deprecation': 'off',
221221
'arrow-body-style': 'off',
222+
'no-continue': 'off',
222223

223224
// Import specific rules
224225
'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],

.github/scripts/buildActions.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,21 @@ for ((i=0; i < ${#GITHUB_ACTIONS[@]}; i++)); do
4949
ASYNC_BUILDS[i]=$!
5050
done
5151

52+
EXIT_CODE=0
5253
for ((i=0; i < ${#GITHUB_ACTIONS[@]}; i++)); do
5354
ACTION=${GITHUB_ACTIONS[$i]}
5455
ACTION_DIR=$(dirname "$ACTION")
56+
ACTION_NAME=$(basename "$ACTION" .ts)
5557

5658
# Wait for the background build to finish
57-
wait "${ASYNC_BUILDS[$i]}"
58-
59-
# Prepend the warning note to the top of the compiled file
60-
OUTPUT_FILE="$ACTION_DIR/index.js"
61-
echo "$NOTE_DONT_EDIT$(cat "$OUTPUT_FILE")" > "$OUTPUT_FILE"
59+
if wait "${ASYNC_BUILDS[$i]}"; then
60+
# Prepend the warning note to the top of the compiled file
61+
OUTPUT_FILE="$ACTION_DIR/index.js"
62+
echo "$NOTE_DONT_EDIT$(cat "$OUTPUT_FILE")" > "$OUTPUT_FILE"
63+
else
64+
echo "$ACTION_NAME failed to build: $ACTION_DIR/index.js" >&2
65+
EXIT_CODE=1
66+
fi
6267
done
68+
69+
exit $EXIT_CODE

.github/workflows/createNewVersion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ jobs:
126126
echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
127127
git fetch origin main
128128
if ! git rebase origin/main; then
129-
echo "::error:: Rebase failed while retrying Mobile-Expensify push"
129+
echo "::error:: Rebase failed while retrying E/App push"
130130
exit 1
131131
fi
132132
if ! git push origin main; then
133-
echo "::error:: Mobile-Expensify change failed to push after rebase"
133+
echo "::error:: E/App change failed to push after rebase"
134134
exit 1
135135
fi
136136
fi

.github/workflows/deployNewHelp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# v4
5959
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
6060
with:
61-
node-version: '20.19.1'
61+
node-version-file: '.nvmrc'
6262

6363
# Wil install the _help/package.js
6464
- name: Install Node.js Dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.1
1+
20.19.3

.storybook/preview.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import React from 'react';
33
import Onyx from 'react-native-onyx';
44
import {SafeAreaProvider} from 'react-native-safe-area-context';
55
import type {Parameters} from 'storybook/internal/types';
6+
import OnyxListItemProvider from '@components/OnyxListItemProvider';
67
import {SearchContextProvider} from '@components/Search/SearchContext';
78
import ComposeProviders from '@src/components/ComposeProviders';
89
import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
910
import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
10-
import OnyxProvider from '@src/components/OnyxProvider';
1111
import {EnvironmentProvider} from '@src/components/withEnvironment';
1212
import {KeyboardStateProvider} from '@src/components/withKeyboardState';
1313
import ONYXKEYS from '@src/ONYXKEYS';
@@ -23,7 +23,16 @@ Onyx.init({
2323
const decorators = [
2424
(Story: React.ElementType) => (
2525
<ComposeProviders
26-
components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider, EnvironmentProvider, KeyboardStateProvider, SearchContextProvider]}
26+
components={[
27+
OnyxListItemProvider,
28+
LocaleContextProvider,
29+
HTMLEngineProvider,
30+
SafeAreaProvider,
31+
PortalProvider,
32+
EnvironmentProvider,
33+
KeyboardStateProvider,
34+
SearchContextProvider,
35+
]}
2736
>
2837
<Story />
2938
</ComposeProviders>

Mobile-Expensify

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 1009018001
118-
versionName "9.1.80-1"
117+
versionCode 1009018202
118+
versionName "9.1.82-2"
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"

contributingGuides/HOW_TO_BECOME_A_CONTRIBUTOR_PLUS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ C+ are contributors who are experienced at working with Expensify and have gaine
1313
- If C+ ever applies to work at Expensify, they’ve got a leg up on the competition because they're familiar with the company and processes. View job openings at https://we.are.expensify.com.
1414

1515
## Requirements to join C+
16-
- Have had 10 PRs deployed to production without regressions.
16+
- Have had 30 PRs deployed to production without regressions.
1717
- Follow our Code of Conduct, Contributing.md and README.md docs and processes.
1818
- Comment and fix bugs in a timely manner.
1919
- Clear communicator

0 commit comments

Comments
 (0)