Skip to content

Commit fc63f1b

Browse files
authored
Merge branch 'Expensify:main' into feat/sentry-search-modal-metric
2 parents 993c836 + c863f8c commit fc63f1b

59 files changed

Lines changed: 1393 additions & 433 deletions

Some content is hidden

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

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,29 @@ jobs:
5959
variant: ${{ matrix.variant }}
6060
rock-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
6161
comment-bot: false
62+
63+
- name: Download Rock artifact
64+
env:
65+
ARTIFACT_URL: ${{ env.ARTIFACT_URL }}
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
run: |
68+
echo "Downloading artifact from: $ARTIFACT_URL"
69+
curl -L \
70+
-H "Authorization: Bearer $GITHUB_TOKEN" \
71+
-H "Accept: application/octet-stream" \
72+
"$ARTIFACT_URL" -o artifact.zip
73+
unzip artifact.zip -d artifact_contents
74+
75+
- name: Find APK
76+
run: |
77+
APK=$(find artifact_contents -type f -name "*.apk" | head -n 1)
78+
if [ -z "$APK" ]; then
79+
echo "No APK found in artifact"
80+
exit 1
81+
fi
82+
echo "APK_PATH=$APK" >> "$GITHUB_ENV"
83+
echo "Using APK: $APK"
84+
85+
- name: Verify ELF alignment
86+
run: |
87+
scripts/check-elf-alignment.sh "$APK_PATH"

docs/articles/expensify-classic/expenses/Add-an-expense.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Track business travel with distance-based expenses using one of these methods. M
7272
2. Under **Distance**, select:
7373
- **Manually create** – enter miles and rate. Tap **More options** for category, description, report.
7474
- **Odometer** – enter pre/post trip readings and rate. Tap **More options** to complete.
75+
- **Start GPS** – Tap **Start** at the start of your trip, and tap **Stop** when you reach your destination. For best results, keep the Expensify app open.
7576
3. Tap **Save**.
7677

7778
## Available options for tracking distance
@@ -81,7 +82,7 @@ Track business travel with distance-based expenses using one of these methods. M
8182
- **Mobile app**
8283
- **Manually create** – enter miles and rate.
8384
- **Odometer** – log before/after readings.
84-
- **Start GPS**currently unavailable.
85+
- **Start GPS**automatically tracks your mileage using GPS.
8586

8687
---
8788

166 KB
Loading
129 KB
Loading
152 KB
Loading
147 KB
Loading
185 KB
Loading
159 KB
Loading

src/CONST/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3365,6 +3365,7 @@ const CONST = {
33653365
CARD_NAME: 'CardName',
33663366
TRANSACTION_START_DATE: 'TransactionStartDate',
33673367
CONFIRMATION: 'Confirmation',
3368+
INVITE_NEW_MEMBER: 'InviteNewMember',
33683369
},
33693370
TRANSACTION_START_DATE_OPTIONS: {
33703371
FROM_BEGINNING: 'fromBeginning',
@@ -3410,6 +3411,7 @@ const CONST = {
34103411
LIMIT: 'Limit',
34113412
CARD_NAME: 'CardName',
34123413
CONFIRMATION: 'Confirmation',
3414+
INVITE_NEW_MEMBER: 'InviteNewMember',
34133415
},
34143416
CARD_TYPE: {
34153417
PHYSICAL: 'physical',
@@ -3483,6 +3485,9 @@ const CONST = {
34833485
LAST_BUSINESS_DAY_OF_MONTH: 'LAST_BUSINESS_DAY_OF_MONTH',
34843486
CUSTOM_DAY_OF_MONTH: 'CUSTOM_DAY_OF_MONTH',
34853487
},
3488+
CARD_NAME: {
3489+
CASH: '__CASH__',
3490+
},
34863491
CARD_LIST_THRESHOLD: 8,
34873492
DEFAULT_EXPORT_TYPE: 'default',
34883493
EXPORT_CARD_TYPES: {

src/ROUTES.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,12 @@ const ROUTES = {
25022502
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
25032503
getRoute: (backTo?: string) => getUrlWithBackToParam(`travel/public-domain-error`, backTo),
25042504
},
2505-
TRAVEL_WORKSPACE_CONFIRMATION: 'travel/upgrade/workspace/confirmation',
2505+
TRAVEL_WORKSPACE_CONFIRMATION: {
2506+
route: 'travel/upgrade/workspace/confirmation',
2507+
2508+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2509+
getRoute: (backTo?: string) => getUrlWithBackToParam(`travel/upgrade/workspace/confirmation`, backTo),
2510+
},
25062511
TRAVEL_WORKSPACE_ADDRESS: {
25072512
route: 'travel/:domain/workspace-address',
25082513

0 commit comments

Comments
 (0)