Skip to content

Commit 1ebae27

Browse files
committed
Merge branch 'main' of https://github.com/TaduJR/App into feat-Add-an-exposed-filter-for-workspace-when-a-user-is-a-member-of-several-workspaces
2 parents 1336839 + b3b1423 commit 1ebae27

174 files changed

Lines changed: 4638 additions & 819 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/ISSUE_TEMPLATE/Standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ___
1010
**Version Number:**
1111
**Reproducible in staging?:**
1212
**Reproducible in production?:**
13-
**If this was caught during regression testing, add the test name, ID and link from TestRail:**
13+
**If this was caught during regression testing, add the test name, ID and link from BrowserStack:**
1414
**Email or phone of affected tester (no customers):**
1515
**Logs:** https://stackoverflow.com/c/expensify/questions/4856
1616
**Expensify/Expensify Issue URL:**

.github/actions/javascript/getPullRequestIncrementalChanges/index.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12746,6 +12746,24 @@ class Git {
1274612746
hasChanges: files.length > 0,
1274712747
};
1274812748
}
12749+
/**
12750+
* Check if a file from a Git diff is added.
12751+
*
12752+
* @param file - The file to check
12753+
* @returns true if the file is added, false otherwise
12754+
*/
12755+
static isAddedDiffFile(file) {
12756+
const hasAddedLines = file.addedLines.size > 0;
12757+
const hasModifiedLines = file.modifiedLines.size > 0;
12758+
const hasRemovedLines = file.removedLines.size > 0;
12759+
if (!hasAddedLines || hasModifiedLines || hasRemovedLines) {
12760+
return false;
12761+
}
12762+
if (file.hunks.length === 1 && file.hunks.at(0)?.oldStart === 0 && file.hunks.at(0)?.oldCount === 0) {
12763+
return true;
12764+
}
12765+
return false;
12766+
}
1274912767
/**
1275012768
* Calculate the line number for a diff line based on the hunk and line type.
1275112769
*/

.github/workflows/prettier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Verify there's no Prettier diff
3030
run: |
31-
npm run prettier -- --log-level silent
31+
npm run prettier -- --log-level error
3232
if ! git diff --name-only --exit-code; then
3333
# shellcheck disable=SC2016
3434
echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'

.github/workflows/react-compiler-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# In phase 0 of the React Compiler compliance check rollout,
2929
# we want to report failures but don't fail the check.
3030
# See https://github.com/Expensify/App/issues/68765#issuecomment-3487317881
31-
run: npm run react-compiler-compliance-check check-changed || true
31+
run: npm run react-compiler-compliance-check check-changed -- --filterByDiff --enforceNewComponents
3232
env:
3333
CI: true
3434
GITHUB_TOKEN: ${{ github.token }}

Mobile-Expensify

__mocks__/reportData/violations.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const receiptErrorsR14932: ReceiptErrors = {
3131
retryParams: {
3232
transactionID: RECEIPT_ERRORS_TRANSACTION_ID_R14932,
3333
source: CONST.POLICY.ID_FAKE,
34+
transactionPolicy: undefined,
3435
},
3536
},
3637
};

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 1009027400
118-
versionName "9.2.74-0"
117+
versionCode 1009027406
118+
versionName "9.2.74-6"
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"

cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,8 @@
794794
"setuptools",
795795
"DYNAMICEXTERNAL",
796796
"RNCORE",
797-
"Wooo"
797+
"Wooo",
798+
"Splittable"
798799
],
799800
"ignorePaths": [
800801
"src/languages/de.ts",

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.2.74.0</string>
47+
<string>9.2.74.6</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.2.74</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.74.0</string>
16+
<string>9.2.74.6</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

0 commit comments

Comments
 (0)