Skip to content

Commit 9b25ca8

Browse files
committed
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
2 parents d271555 + f6ccfc2 commit 9b25ca8

157 files changed

Lines changed: 1823 additions & 690 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.

Mobile-Expensify

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
510510
[submodule "Mobile-Expensify"]
511511
ignore = all
512512
```
513-
4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
513+
4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App.
514514

515515

516516
> [!Note]

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 1009016605
118-
versionName "9.1.66-5"
117+
versionCode 1009016702
118+
versionName "9.1.67-2"
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"

assets/images/menu.svg

Lines changed: 9 additions & 1 deletion
Loading

desktop/main.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {translate} from '@libs/Localize';
1111
import Log from '@libs/Log';
1212
import CONFIG from '@src/CONFIG';
1313
import CONST from '@src/CONST';
14+
import TranslationStore from '@src/languages/TranslationStore';
1415
import type {TranslationPaths} from '@src/languages/types';
1516
import type PlatformSpecificUpdater from '@src/setup/platformSetup/types';
1617
import type {Locale} from '@src/types/onyx';
@@ -665,10 +666,12 @@ const mainWindow = (): Promise<void> => {
665666
// because the only way code can be shared between the main and renderer processes at runtime is via the context bridge
666667
// So we track preferredLocale separately via ELECTRON_EVENTS.LOCALE_UPDATED
667668
ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale: Locale) => {
668-
preferredLocale = updatedLocale;
669-
Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
670-
disposeContextMenu?.();
671-
disposeContextMenu = createContextMenu(updatedLocale);
669+
TranslationStore.load(updatedLocale).then(() => {
670+
preferredLocale = updatedLocale;
671+
Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
672+
disposeContextMenu?.();
673+
disposeContextMenu = createContextMenu(updatedLocale);
674+
});
672675
});
673676

674677
ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {

docs/articles/expensify-classic/reports/Edit-and-Submit-Expense-Reports.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,20 @@ Some Workspaces automatically handle this. Otherwise, submit manually.
163163

164164
**Note:** Reports with **Instant Submit** cannot be fully retracted. Only individual expenses can be edited.
165165

166+
## Delete an Open Report
167+
168+
**On Desktop:**
169+
1. Click on the Reports tab.
170+
2. Select the checkbox next to the Open Report you wish to delete.
171+
3. Click on the red trash icon.
172+
173+
**On Mobile:**
174+
1. Tap ☰ and go to **Reports**.
175+
2. Long-press the Open Report that you wish to delete.
176+
3. Select the **Delete** button.
177+
178+
**Note:** Deleted expenses are moved to a Deleted folder and can be restored if needed.
179+
166180
---
167181

168182
# Add Comments & Attachments to a Report

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.1.66</string>
26+
<string>9.1.67</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.66.5</string>
47+
<string>9.1.67.2</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.66</string>
14+
<string>9.1.67</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.66.5</string>
16+
<string>9.1.67.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.66</string>
14+
<string>9.1.67</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.66.5</string>
16+
<string>9.1.67.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

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

0 commit comments

Comments
 (0)