Skip to content

Commit c35c9d7

Browse files
committed
Merge branch 'main' into fix/69130
2 parents e1c5175 + a24b0c0 commit c35c9d7

280 files changed

Lines changed: 5343 additions & 1939 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.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ module.exports = {
259259
selector: 'TSEnumDeclaration',
260260
message: "Please don't declare enums, use union types instead.",
261261
},
262+
{
263+
selector: 'CallExpression[callee.name="getUrlWithBackToParam"]',
264+
message:
265+
'Usage of getUrlWithBackToParam function is prohibited. This is legacy code and no new occurrences should be added. Please look into documentation and use alternative routing methods instead.',
266+
},
262267

263268
// These are the original rules from AirBnB's style guide, modified to allow for...of loops and for...in loops
264269
{

.github/CODEOWNERS

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Every PR gets a review from an internal Expensify engineer
22
* @Expensify/pullerbear
33

4-
# PRs that touch the front end source code, get an additional review from the product-pr team
5-
src/ @Expensify/product-pr @Expensify/pullerbear
6-
74
# PRs that touch the front end style or assets, get an additional review from the Design team
8-
src/styles/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear
9-
assets/ @Expensify/design @Expensify/product-pr @Expensify/pullerbear
5+
src/styles/ @Expensify/design @Expensify/pullerbear
6+
assets/ @Expensify/design @Expensify/pullerbear

.github/workflows/reassurePerformanceTests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
echo "Deleted file: $file"
4141
fi
4242
done
43+
- name: Capture PR head SHA
44+
if: ${{ github.event_name == 'pull_request' }}
45+
run: echo "PR_SHA=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
4346

4447
- name: Run performance testing script
4548
shell: bash
@@ -54,7 +57,7 @@ jobs:
5457
git add Mobile-Expensify
5558
npm install --force || (rm -rf node_modules && npm install --force)
5659
NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
57-
git switch --force --detach -
60+
git switch --force --detach "${PR_SHA:-${GITHUB_SHA}}"
5861
cd Mobile-Expensify
5962
git checkout "$(git rev-parse HEAD)"
6063
cd ..

.github/workflows/remote-build-android.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Remote Build Android
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
mobile_expensify_pr:
7+
description: 'Mobile-Expensify PR number to use for hybrid build'
8+
required: false
9+
type: string
510
push:
611
branches-ignore: [staging, production, cherry-pick-*]
712
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
@@ -35,6 +40,14 @@ jobs:
3540
with:
3641
IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
3742

43+
- name: Checkout specific Mobile-Expensify PR
44+
if: ${{ matrix.is_hybrid_build && github.event.inputs.mobile_expensify_pr }}
45+
run: |
46+
cd Mobile-Expensify
47+
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
48+
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
49+
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
50+
3851
- name: RNEF Remote Build - Android
3952
# rnef v2
4053
uses: callstackincubator/android@d9a81f860e436ff2971323990244e32830dcabd1

.github/workflows/remote-build-ios.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Remote Build iOS
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
mobile_expensify_pr:
7+
description: 'Mobile-Expensify PR number to use for hybrid build'
8+
required: false
9+
type: string
510
push:
611
branches-ignore: [staging, production, cherry-pick-*]
712
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
@@ -39,6 +44,14 @@ jobs:
3944
with:
4045
IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
4146

47+
- name: Checkout specific Mobile-Expensify PR
48+
if: ${{ matrix.is_hybrid_build && github.event.inputs.mobile_expensify_pr }}
49+
run: |
50+
cd Mobile-Expensify
51+
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
52+
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
53+
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
54+
4255
- name: RNEF Remote Build - iOS
4356
# rnef v2
4457
uses: callstackincubator/ios@7847e0676242cefa801cba8ede6736140b7bae91

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 1009020109
118-
versionName "9.2.1-9"
117+
versionCode 1009020300
118+
versionName "9.2.3-0"
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"

android/app/src/main/java/com/expensify/chat/ShareActionHandlerModule.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ShareActionHandlerModule(reactContext: ReactApplicationContext) :
3636
val shareObject = JSONObject(shareObjectString)
3737
val content = shareObject.optString("content")
3838
val mimeType = shareObject.optString("mimeType")
39-
val fileUriPath = "file://$content"
4039
val timestamp = System.currentTimeMillis()
4140

4241
val file = File(content)
@@ -53,6 +52,8 @@ class ShareActionHandlerModule(reactContext: ReactApplicationContext) :
5352

5453
val identifier = file.name
5554
var aspectRatio = 0.0f
55+
val fileUri = android.net.Uri.fromFile(file)
56+
val fileUriPath = fileUri.toString()
5657

5758
if (mimeType.startsWith("image/")) {
5859
val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)