Skip to content

Commit 5d6e22b

Browse files
committed
Merge branch 'main' into refactor-iou-tax-setters
2 parents db308d2 + 809efef commit 5d6e22b

888 files changed

Lines changed: 24510 additions & 4699 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/buildAndroid.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ jobs:
123123
distribution: oracle
124124
java-version: ${{ steps.get-java-version.outputs.version }}
125125

126+
# v6.1.0
126127
- name: Setup Gradle
127-
# v4
128-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
128+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
129129

130130
- name: Setup 1Password CLI and certificates
131131
uses: Expensify/GitHub-Actions/setup-certificate-1p@main

.github/workflows/publishReactNativeAndroidArtifacts.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ jobs:
160160
distribution: oracle
161161
java-version: ${{ steps.get-java-version.outputs.version }}
162162

163+
# v6.1.0
163164
- name: Setup Gradle
164-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
165+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
165166

166167
- name: Determine new patched RN version
167168
id: getNewPatchedVersion

Mobile-Expensify

__mocks__/expo-video.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ const VideoView = forwardRef((props: VideoViewProps, ref: ForwardedRef<View>) =>
101101
<View
102102
ref={ref}
103103
accessibilityLabel="MockVideoView"
104-
// eslint-disable-next-line react/jsx-props-no-spreading
105104
{...props}
106105
/>
107106
));

__mocks__/react-native-safe-area-context.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
2323
function WithSafeAreaInsets(props: WithSafeAreaInsetsProps & {ref: React.ForwardedRef<unknown>}) {
2424
return (
2525
<WrappedComponent
26-
// eslint-disable-next-line react/jsx-props-no-spreading
2726
{...props}
2827
ref={props.ref}
2928
insets={insets}
@@ -34,7 +33,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
3433
function WithSafeAreaInsetsWithRef(props: WithSafeAreaInsetsProps & {ref: ForwardedRef<unknown>}) {
3534
return (
3635
<WithSafeAreaInsets
37-
// eslint-disable-next-line react/jsx-props-no-spreading
3836
{...props}
3937
ref={props.ref}
4038
/>

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009037400
115-
versionName "9.3.74-0"
114+
versionCode 1009037501
115+
versionName "9.3.75-1"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"
Lines changed: 1 addition & 0 deletions
Loading

assets/images/product-illustrations/illustration__copilots.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

config/eslint/eslint.config.mjs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,6 @@ const config = defineConfig([
402402
selector: 'CallExpression[callee.object.name="React"][callee.property.name="forwardRef"]',
403403
message: 'forwardRef is deprecated. Please use ref as a prop instead. See: contributingGuides/STYLE.md#forwarding-refs',
404404
},
405-
{
406-
selector: 'CallExpression[callee.name="getUrlWithBackToParam"]',
407-
message:
408-
'Usage of getUrlWithBackToParam function is prohibited. This is legacy code and no new occurrences should be added. Please look into the `How to remove backTo from URL` section in contributingGuides/NAVIGATION.md. and use alternative routing methods instead.',
409-
},
410405
{
411406
selector: 'ImportNamespaceSpecifier[parent.source.value=/^@libs/]',
412407
message: 'Namespace imports from @libs are not allowed. Use named imports instead. Example: import { method } from "@libs/module"',
@@ -766,6 +761,7 @@ const config = defineConfig([
766761
'web/snippets/gib.js',
767762
// Generated language files - excluded from ESLint but still type-checked
768763
'src/languages/de.ts',
764+
'src/languages/es.ts',
769765
'src/languages/fr.ts',
770766
'src/languages/it.ts',
771767
'src/languages/ja.ts',

0 commit comments

Comments
 (0)