Skip to content

Commit 4ea081f

Browse files
committed
Merge branch 'main' into fixSearchActionFilter
2 parents 4cbebe1 + 40f2c56 commit 4ea081f

164 files changed

Lines changed: 6218 additions & 1842 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/OnboardOffboardExpertContributor.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ labels: Daily, Task, Access Change
1111
- [ ] Add / remove from the following Slack channels via Slack Connect
1212
- [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
1313
- [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
14-
- [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
1514
- [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
1615
- [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
1716
- [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ jobs:
298298
needs: prep
299299
runs-on: macos-15-xlarge
300300
env:
301-
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
301+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
302302
SHOULD_BUILD_APP: ${{ github.ref == 'refs/heads/staging' || fromJSON(needs.prep.outputs.IS_CHERRY_PICK) }}
303303
steps:
304304
- name: Checkout

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build:
2121
runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
2222
env:
23-
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
23+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
2424
strategy:
2525
fail-fast: false
2626
matrix:

.github/workflows/testBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ jobs:
330330
if: ${{ inputs.IOS }}
331331
needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
332332
env:
333-
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
333+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
334334
PULL_REQUEST_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
335335
runs-on: macos-15-xlarge
336336
outputs:

.github/workflows/verifyHybridApp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
name: Verify iOS HybridApp builds on main
114114
runs-on: macos-15-xlarge
115115
env:
116-
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
116+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
117117
# Only run on pull requests that are *not* on a fork
118118
if: ${{ !github.event.pull_request.head.repo.fork && github.event_name == 'pull_request' }}
119119
steps:

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 1009031003
118-
versionName "9.3.10-3"
117+
versionCode 1009031100
118+
versionName "9.3.11-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/MainApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
4242
add(NavBarManagerPackage())
4343
}
4444

45-
override fun getJSMainModuleName() = ".expo/.virtual-metro-entry"
45+
override fun getJSMainModuleName() = "index"
4646

4747
override val isNewArchEnabled: Boolean
4848
get() = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED

assets/images/basket.svg

Lines changed: 1 addition & 0 deletions
Loading

babel.config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const webpack = {
6565
};
6666

6767
const metro = {
68-
presets: [require('@react-native/babel-preset')],
68+
presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: true}]],
6969
plugins: [
7070
['babel-plugin-react-compiler', ReactCompilerConfig], // must run first!
7171

@@ -177,5 +177,13 @@ module.exports = (api) => {
177177
const runningIn = api.caller((args = {}) => args.name);
178178
console.debug(' - running in: ', runningIn);
179179

180+
const isJest = runningIn === 'babel-jest';
181+
if (isJest) {
182+
return {
183+
...metro,
184+
presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: false}]],
185+
};
186+
}
187+
180188
return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
181189
};

0 commit comments

Comments
 (0)