Skip to content

Commit 215e339

Browse files
committed
Merge branch 'main' of https://github.com/Expensify/App into ikevin127-proposalPoliceDupe
2 parents b877e0b + d49220a commit 215e339

462 files changed

Lines changed: 7411 additions & 5420 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/scripts/createDocsRoutes.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const routes = yaml.load(fs.readFileSync(`${docsDir}/_data/_routes.yml`, 'utf8')
4141
const platformNames = {
4242
expensifyClassic: 'expensify-classic',
4343
newExpensify: 'new-expensify',
44+
travel: 'travel',
4445
} as const;
4546

4647
/**
@@ -140,9 +141,11 @@ function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof pla
140141
function run() {
141142
const expensifyClassicArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.expensifyClassic}`);
142143
const newExpensifyArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.newExpensify}`);
144+
const travelArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.travel}`);
143145

144146
const expensifyClassicRoute = routes.platforms.find((platform) => platform.href === platformNames.expensifyClassic);
145147
const newExpensifyRoute = routes.platforms.find((platform) => platform.href === platformNames.newExpensify);
148+
const travelRoute = routes.platforms.find((platform) => platform.href === platformNames.travel);
146149

147150
if (expensifyClassicArticleHubs.length !== expensifyClassicRoute?.hubs.length) {
148151
console.error(warnMessage(platformNames.expensifyClassic));
@@ -154,8 +157,14 @@ function run() {
154157
process.exit(1);
155158
}
156159

160+
if (travelArticleHubs.length !== travelRoute?.hubs.length) {
161+
console.error(warnMessage(platformNames.travel));
162+
process.exit(1);
163+
}
164+
157165
createHubsWithArticles(expensifyClassicArticleHubs, platformNames.expensifyClassic, expensifyClassicRoute.hubs);
158166
createHubsWithArticles(newExpensifyArticleHubs, platformNames.newExpensify, newExpensifyRoute.hubs);
167+
createHubsWithArticles(travelArticleHubs, platformNames.travel, travelRoute.hubs);
159168

160169
// Convert the object to YAML and write it to the file
161170
let yamlString = yaml.dump(routes);

.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

.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 1009018005
118-
versionName "9.1.80-5"
117+
versionCode 1009018204
118+
versionName "9.1.82-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"
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)