Skip to content

Commit f394e79

Browse files
committed
Merge branch 'main' of https://github.com/Expensify/App into feat/50908-GR-Phase-3-Step5-chat-view
2 parents 7616bd8 + 227c0c2 commit f394e79

145 files changed

Lines changed: 3108 additions & 1353 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/remote-build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build Android
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build iOS
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

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 1009019905
118-
versionName "9.1.99-5"
117+
versionCode 1009020000
118+
versionName "9.2.0-0"
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"

docs/articles/expensify-classic/reports/Set-Custom-Report-Names.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Automatically generate standardized report titles across your workspace using fo
1111

1212
# Customize Report Titles Using Formulas
1313

14-
**Navigation:**
14+
**To set a custom report title on your workspace:**
1515
1. Head to **Settings > Workspace > [Workspace Name] > Rules**.
1616
2. Scroll to **Custom Report Names**.
1717
3. Configure the title formula using your preferred formulas (see below).

docs/articles/new-expensify/connections/quickbooks-desktop/Connect-to-QuickBooks-Desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To connect QuickBooks Desktop to Expensify, you must log in as an Admin in Quick
3838

3939
---
4040

41-
# Step 3: Authorize and Finalize the Connection\
41+
# Step 3: Authorize and Finalize the Connection
4242

4343
1. In QuickBooks Desktop, select **Yes, always allow access, even when QuickBooks is not running**, then click **Continue**
4444
2. Click **OK**, then click **Yes**

docs/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This will enable the connection between QuickBooks Online and import your settin
7171

7272
# FAQ
7373

74-
# Why do I see a red dot next to the QuickBooks Online connection?
74+
## Why do I see a red dot next to the QuickBooks Online connection?
7575

7676
A red dot means there’s a connection error. You’ll see this:
7777

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
---
2+
title: setup-expensify-card-uk-eu.md
3+
description: Learn how to set up and use the Expensify Card in the UK and EEA, including eligibility, supported countries, and step-by-step setup instructions.
4+
keywords: Expensify Card UK, EEA, Global Reimbursements, GBP, EUR, card setup, issue cards, supported countries, Smart Limit
5+
---
6+
7+
<div id="new-expensify" markdown="1">
8+
9+
The Expensify Card is now available for companies in the United Kingdom and the European Economic Area (EEA)! This guide walks you through eligibility and how to set up and start using the card in GBP or EUR. We are currently issuing virtual cards only, but will be releasing physical cards very soon!
10+
11+
# Expensify Card (UK/EU) setup
12+
13+
## Who can use the UK/EEA Expensify Card?
14+
15+
The card is currently available for:
16+
- Companies with **Global Reimbursements enabled**
17+
- Businesses located in supported **UK or EEA countries**
18+
19+
If your company isn't yet set up with Global Reimbursements, follow [this guide](https://docs.expensify.com) to get started.
20+
21+
---
22+
23+
## Supported countries
24+
25+
You can issue cards to employees in:
26+
- Belgium, Cyprus, Estonia, Finland, Germany, Greece, Ireland, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Slovenia, Spain, and the UK
27+
28+
**Note:** Cards can't currently be issued in Iceland, Croatia, or Bulgaria—but they can still be used in these locations.
29+
30+
---
31+
32+
## How to set up the Expensify Card
33+
34+
### 1. Enable the Expensify Card for your Workspace
35+
36+
1. If you don't already have a GBP or EUR bank account connected, follow [this process](link to ND GR process to come) to connect one.
37+
2. Complete the Know Your Customer (KYC) form.
38+
3. Go to `Settings > Workspaces > [Workspace Name] > More features`.
39+
4. Under **Spend**, toggle on **Expensify Card**.
40+
5. Select **Expensify Card** tab will appear in the left-hand menu.
41+
6. Follow the prompts to request the Expensify Card.
42+
43+
---
44+
45+
### 2. Link a settlement bank account
46+
47+
1. Go to `Workspaces > [Workspace Name] > Expensify Card`.
48+
2. Click **Issue new card**.
49+
3. Choose an existing **GBP or EUR bank account** to settle card transactions.
50+
51+
---
52+
53+
### 3. Issue a new card
54+
55+
1. Navigate to `Workspaces > [Workspace Name] > Expensify Card`.
56+
2. Click **Issue new card**.
57+
3. Select the employee.
58+
4. Choose **Virtual** or **Physical**.
59+
5. Pick a limit type:
60+
- **Smart limit** – Spend up to a threshold before needing approval.
61+
- **Monthly limit** – Capped monthly spend.
62+
- **Fixed limit** – One-time spend cap (card closes once reached).
63+
6. Enter the **spending limit**.
64+
7. Name the card for easier tracking.
65+
8. Click **Issue card** to confirm.
66+
67+
---
68+
69+
### 4. Access your Virtual Card
70+
71+
Once you have issued a Virtual Card to a user, they can:
72+
73+
1. Go to `Settings > Account > Wallet`.
74+
2. Under Assign Cards click Expensify Card.
75+
3. Click Reveal Details.
76+
4. The user will be sent a Magic Code to the email or phone number associated with the account.
77+
5. Enter the Magic Code to reveal the Virtual Card details
78+
79+
---
80+
81+
### 5. Start using the card
82+
83+
You're all set! Employees can now spend using their Expensify Cards in **GBP or EUR**. All transactions will automatically appear in the Workspace Feed.
84+
85+
---
86+
87+
# FAQ
88+
89+
## What exchange rate is used for foreign currency purchases?
90+
91+
We use the [Visa FX calculator](https://www.visa.co.uk/support/consumer/travel-support/exchange-rate-calculator.html) to determine exchange rates for purchases made in currencies other than GBP or EUR.
92+
93+
## Need help?
94+
95+
If you're unsure about eligibility or need help activating a card, message **Concierge** directly from the app—we're happy to help!
96+
97+
</div>

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.99</string>
26+
<string>9.2.0</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.99.5</string>
47+
<string>9.2.0.0</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.99</string>
14+
<string>9.2.0</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.99.5</string>
16+
<string>9.2.0.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

0 commit comments

Comments
 (0)