Skip to content

Commit d6f64ec

Browse files
committed
Merge branch 'main' into chore/79041-refactor-add-personal-ba-page-to-use-usesubpage
2 parents b9e9fa4 + 5023f38 commit d6f64ec

File tree

350 files changed

+5264
-2404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+5264
-2404
lines changed

.claude/agents/code-inline-reviewer.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Each rule file contains:
5656
8. **DO NOT invent new rules, stylistic preferences, or commentary outside the listed rules.**
5757
9. **DO NOT describe what you are doing or add extra content.**
5858
EXCEPTION: If you believe something MIGHT be a Rule violation but are uncertain, err on the side of including it in the violations array rather than skipping it.
59-
10. **Reality check before posting**: Before creating each inline comment, re-read the specific code one more time and confirm the violation is real. If upon re-reading you realize the code is actually correct, **do NOT post the comment** — silently skip it and move on. Never post a comment that flags a violation and then concludes it is not actually a problem.
6059

6160
## Comment Format
6261

.github/ISSUE_TEMPLATE/DesignDoc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Design Doc tracking issue
33
about: A standard template to follow when leading a project
4-
labels: Daily, NewFeature
4+
labels: Daily, NewFeature, DesignDoc
55
---
66

77
## Proposal

.github/workflows/buildIOS.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,7 @@ jobs:
245245
run: |
246246
IPA_FILE=$(find .rock/cache/ios/export/ -maxdepth 1 -name '*.ipa' -print -quit 2>/dev/null || true)
247247
if [ -z "$IPA_FILE" ]; then
248-
if [ "${{ inputs.variant }}" = "Adhoc" ]; then
249-
echo "::warning::No .ipa found locally (expected for remote-cache hits on Adhoc builds)"
250-
else
251-
echo "::error::No .ipa found in .rock/cache/ios/export/"
252-
exit 1
253-
fi
248+
echo "::warning::No .ipa found locally (expected for Rock remote-cache hits)"
254249
else
255250
{
256251
echo "IPA_FILENAME=$(basename "$IPA_FILE")"

Mobile-Expensify

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 1009032608
115-
versionName "9.3.26-8"
114+
versionCode 1009032702
115+
versionName "9.3.27-2"
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"

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ import expo.modules.ReactNativeHostWrapper
2626
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
2727

2828
class MainApplication : MultiDexApplication(), ReactApplication {
29+
companion object {
30+
private const val APP_START_TIME_PREFERENCES = "AppStartTime"
31+
}
2932
override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
3033
override fun getUseDeveloperSupport() = BuildConfig.DEBUG
3134

@@ -53,6 +56,10 @@ class MainApplication : MultiDexApplication(), ReactApplication {
5356

5457
override fun onCreate() {
5558
super.onCreate()
59+
getSharedPreferences(APP_START_TIME_PREFERENCES, MODE_PRIVATE)
60+
.edit()
61+
.putLong(APP_START_TIME_PREFERENCES, System.currentTimeMillis())
62+
.apply()
5663
ReactFontManager.getInstance().addCustomFont(this, "Custom Emoji Font", R.font.custom_emoji_font)
5764
ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
5865
ReactFontManager.getInstance().addCustomFont(this, "Expensify Neue", R.font.expensify_neue)
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)