Skip to content

Commit 5304b9a

Browse files
authored
Merge branch 'Expensify:main' into timing-module-deprecate
2 parents 75281b8 + 1712204 commit 5304b9a

88 files changed

Lines changed: 1726 additions & 1756 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/workflows/preDeploy.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ jobs:
5858

5959
- name: Check if merged pull request should trigger a deploy
6060
id: shouldDeploy
61-
run: echo "SHOULD_DEPLOY=${{ (!fromJSON(steps.isStagingDeployLocked.outputs.IS_LOCKED) && github.actor != 'OSBotify') }}" >> "$GITHUB_OUTPUT"
61+
run: |
62+
if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
63+
echo "SHOULD_DEPLOY=${{ (!fromJSON(steps.isStagingDeployLocked.outputs.IS_LOCKED) && github.actor != 'OSBotify') }}" >> "$GITHUB_OUTPUT"
64+
else
65+
echo "SHOULD_DEPLOY=false" >> "$GITHUB_OUTPUT"
66+
fi
6267
6368
skipDeploy:
6469
runs-on: ubuntu-latest

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 1009031115
118-
versionName "9.3.11-15"
117+
versionCode 1009031117
118+
versionName "9.3.11-17"
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"
166 KB
Loading
Lines changed: 1 addition & 1 deletion
Loading

contributingGuides/CONTRIBUTING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,17 @@ Basically, a bad problem statement (ie, a reverse solution statement) is written
124124
### Posting Ideas
125125
Additionally, if you want to discuss an idea with the open source community without having a P/S statement yet, you can post it in #expensify-open-source with the prefix `IDEA:`. All ideas to build the future of Expensify are always welcome! i.e.: "`IDEA:` I don't have a P/S for this yet, but just kicking the idea around... what if we [insert crazy idea]?".
126126

127+
## Working on Sentry Issues
128+
If you have access to Sentry and are investigating an error, please **assign yourself to the Sentry issue** before starting your investigation. This helps prevent duplicate efforts where multiple contributors spend time investigating the same error independently.
129+
130+
When working on Sentry issues:
131+
1. **Assign yourself** in Sentry when you start investigating an issue
132+
2. **Link a GitHub issue** - find or create a GitHub issue for the error, then link it in Sentry using their issue tracking integration
133+
3. **Document your findings** in the linked GitHub issue
134+
4. **Update the Sentry issue status** when the fix is merged (mark as resolved with the version number if applicable)
135+
136+
This helps future investigators understand the history and current status of errors, potentially saving hours of duplicate work.
137+
127138
## Working on Expensify Jobs
128139
*Reminder: For technical guidance, please refer to the [README](https://github.com/Expensify/App/blob/main/README.md)*.
129140

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.3.11.15</string>
47+
<string>9.3.11.17</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.3.11</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.11.15</string>
16+
<string>9.3.11.17</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ PODS:
25192519
- ReactCommon/turbomodule/core
25202520
- SocketRocket
25212521
- Yoga
2522-
- react-native-launch-arguments (4.0.2):
2522+
- react-native-launch-arguments (4.1.1):
25232523
- React
25242524
- react-native-netinfo (11.4.1):
25252525
- boost

ios/ShareViewController/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.3.11</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.11.15</string>
16+
<string>9.3.11.17</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)