Skip to content

Commit f8757ba

Browse files
committed
Merge branch 'main' into issue-63427
2 parents a908135 + 04414ea commit f8757ba

323 files changed

Lines changed: 11477 additions & 8795 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.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: Patch Tracking
3+
about: Template for tracking patches applied to third-party libraries
4+
---
5+
6+
If you haven't already, check out our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md) and [patch guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PATCHES.md) for information on how to manage patches.
7+
___
8+
9+
## Patch Information
10+
11+
**Library Name:** <!-- e.g., react-native-pdf -->
12+
**Library Version:** <!-- e.g., 6.7.3 -->
13+
**Patch Number:** <!-- e.g., 001 -->
14+
**Patch Description:** <!-- e.g., update-podspec-to-support-new-arch -->
15+
**Full Patch Filename:** <!-- e.g., react-native-pdf+6.7.3+001+update-podspec-to-support-new-arch.patch -->
16+
17+
## Patch Details
18+
19+
### Reason for Patch
20+
<!-- Explain why this patch is necessary. What issue does it solve? -->
21+
22+
### Changes Made
23+
<!-- Briefly describe the changes made in the patch -->
24+
25+
### Upstream Status
26+
**Upstream PR/Issue:** <!-- Link to the PR or issue in the upstream repository, if one exists -->
27+
28+
## Related Information
29+
30+
**PR Introducing Patch:** <!-- Link to the PR that introduced this patch -->
31+
32+
## Additional Notes
33+
<!-- Any other relevant information about this patch -->
34+
35+
## Checklist
36+
- [ ] Patch file is correctly named and placed in the appropriate directory
37+
- [ ] Patch is documented in the corresponding `details.md` file
38+
- [ ] This issue is linked in the `details.md` file
39+
- [ ] Upstream PR/issue has been created (if applicable)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: 'Check Test Coverage'
2+
description: 'A simple action that takes a GitHub URL and prints it'
3+
inputs:
4+
GITHUB_URL:
5+
description: 'GitHub repository URL to check'
6+
required: true
7+
8+
runs:
9+
using: 'node20'
10+
main: './index.js'
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
const core = require('@actions/core');
2+
3+
async function run() {
4+
try {
5+
// Get the GitHub URL input
6+
const githubUrl = core.getInput('GITHUB_URL');
7+
8+
// Print the URL
9+
console.log(`GitHub URL: ${githubUrl}`);
10+
core.info(`GitHub URL: ${githubUrl}`);
11+
12+
} catch (error) {
13+
core.setFailed(error.message);
14+
}
15+
}
16+
17+
run();
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Check Test Coverage
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
github_url:
7+
description: 'GitHub repository URL to check'
8+
required: true
9+
type: string
10+
11+
jobs:
12+
check-coverage:
13+
runs-on: ubuntu-latest
14+
name: Check Test Coverage
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Check Test Coverage
20+
uses: ./.github/actions/javascript/checkTestCoverage
21+
with:
22+
GITHUB_URL: ${{ inputs.github_url }}

Mobile-Expensify

__mocks__/@react-navigation/native/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigatio
88

99
const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
1010
const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
11+
const useLocale = isJestEnv ? realReactNavigation.useTheme : () => ({});
1112

1213
const {triggerTransitionEnd, addListener} = isJestEnv
1314
? createAddListenerMock()
@@ -44,14 +45,14 @@ const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
4445
const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
4546
const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
4647
const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
47-
// eslint-disable-next-line @typescript-eslint/naming-convention
48-
const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
48+
const usePreventRemove = isJestEnv ? jest.fn() : () => {};
4949

5050
export {
5151
// Overridden modules
5252
useIsFocused,
5353
useTheme,
5454
useNavigation,
55+
useLocale,
5556
triggerTransitionEnd,
5657

5758
// Theme modules are left alone
@@ -68,7 +69,7 @@ export {
6869
useScrollToTop,
6970
useRoute,
7071
useFocusEffect,
71-
UNSTABLE_usePreventRemove,
72+
usePreventRemove,
7273
};
7374

7475
export type {NativeNavigationMock};

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 1009017101
118-
versionName "9.1.71-1"
117+
versionCode 1009017110
118+
versionName "9.1.71-10"
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: 25 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 30 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)