Skip to content

Commit e88f641

Browse files
committed
Merge branch 'main' into feat/use-reanimated-modal-in-help-modal
2 parents b07bf63 + 609420c commit e88f641

75 files changed

Lines changed: 493 additions & 406 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/createNewVersion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ jobs:
126126
echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
127127
git fetch origin main
128128
if ! git rebase origin/main; then
129-
echo "::error:: Rebase failed while retrying Mobile-Expensify push"
129+
echo "::error:: Rebase failed while retrying E/App push"
130130
exit 1
131131
fi
132132
if ! git push origin main; then
133-
echo "::error:: Mobile-Expensify change failed to push after rebase"
133+
echo "::error:: E/App change failed to push after rebase"
134134
exit 1
135135
fi
136136
fi

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 1009018101
118-
versionName "9.1.81-1"
117+
versionCode 1009018103
118+
versionName "9.1.81-3"
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"

desktop/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"electron-context-menu": "^2.3.0",
88
"electron-log": "^4.4.8",
9-
"electron-updater": "^6.6.4",
9+
"electron-updater": "^6.6.5",
1010
"mime-types": "^2.1.35",
1111
"node-machine-id": "^1.1.12"
1212
},

docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Inside the draft report, tap **Add expense** to include expense items.
2727

2828
**Option A:** Create a new expense:
2929

30-
1. Tap **Add expense** > **Create new expense**.
30+
1. Tap **Add expense** > **Create expense**.
3131
2. Enter the expense details (amount, merchant, category).
3232
3. The expense is added directly to the report.
3333

docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You can add expenses to a report in two ways:
1515

1616
### Create a new expense
1717
1. Open the draft report.
18-
2. Select **Add expense** > **Create new expense**.
18+
2. Select **Add expense** > **Create expense**.
1919
3. Enter the expense details and click **Save**.
2020
4. The new expense appears instantly in the report.
2121

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.1.81.1</string>
47+
<string>9.1.81.3</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.1.81</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.81.1</string>
16+
<string>9.1.81.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

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.1.81</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.81.1</string>
16+
<string>9.1.81.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)