Skip to content

Commit a547c1e

Browse files
committed
Merge remote-tracking branch 'exfy/main' into decompose/selection-toolbar
# Conflicts: # src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
2 parents 0770f01 + 8d383b0 commit a547c1e

236 files changed

Lines changed: 13674 additions & 10083 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

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009035801
115-
versionName "9.3.58-1"
114+
versionCode 1009035807
115+
versionName "9.3.58-7"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"
Lines changed: 1 addition & 0 deletions
Loading

docs/articles/new-expensify/expensify-card/Cardholder-Settings-and-Features.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Using Your Expensify Card in New Expensify
33
description: Learn how to activate, use, and manage your physical and virtual Expensify Card, including Smart Limits, notifications, and troubleshooting.
4-
keywords: [New Expensify, Expensify Card, Smart Limit, activate card, virtual card, card notifications, card declined, eReceipts]
4+
keywords: [New Expensify, Expensify Card, Smart Limit, activate card, virtual card, card notifications, card declined, eReceipts, freeze card, unfreeze card]
55
---
66

77
Once you receive your Expensify Visa® Commercial Card, you can activate it and start using it immediately. When you use your Expensify Card, expenses are automatically created, and SmartScanned receipts are matched to the corresponding transactions. For most purchases, excluding lodging, Expensify also generates IRS-compliant eReceipts. If your organization doesn't require itemized receipts, you can rely on eReceipts to meet documentation requirements.
@@ -96,6 +96,30 @@ For more details on adding a card to Apple or Android Pay, see this [guide](http
9696

9797
---
9898

99+
# How to freeze or unfreeze your Expensify Card
100+
101+
Need to temporarily pause spending? You can freeze your Expensify Card at any time - without canceling or reissuing it.
102+
103+
Freezing your card:
104+
- Immediately blocks new purchases on the card
105+
- Keeps your card number, CVV, and expiration date intact
106+
- Can be reversed at any time
107+
108+
## To freeze or unfreeze your card
109+
110+
1. From the navigation tabs (on the left on web, and at the bottom on mobile), go to **Account > Wallet > Expensify Card**.
111+
2. Click your Expensify Card to view its details.
112+
3. Click **Freeze card** or **Unfreeze card**, depending on the card's current state.
113+
4. Click **Confirm** in the dialog that appears.
114+
115+
Once frozen:
116+
- You'll see a **Frozen** badge and a scarf graphic over your card
117+
- All new transactions will be declined until you unfreeze it
118+
119+
**Note:** If your workspace admin froze the card, you'll need to contact them directly via Expensify Chat to request that they unfreeze it.
120+
121+
---
122+
99123
# FAQ
100124

101125
## What if I haven’t received my Expensify Card?

docs/articles/new-expensify/expensify-card/Set-Up-and-Manage-the-Expensify-Card.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,31 @@ If a card reaches its expiration date, it automatically deactivates and declines
9797

9898
---
9999

100+
# How to freeze or unfreeze an Expensify Card
101+
102+
As a Workspace Admin, you can freeze or unfreeze any card in your workspace without needing to cancel or reissue it.
103+
104+
Freezing a card is helpful if:
105+
- You suspect misuse or a policy violation
106+
- You want to temporarily pause employee spending
107+
- You're enforcing a department-wide budget freeze
108+
109+
To freeze or unfreeze a card:
110+
111+
1. Go to **Settings > Workspaces > [Workspace Name] > Expensify Card**.
112+
2. Click a card from the list to open its details pane.
113+
3. Click **Freeze card** or **Unfreeze card**.
114+
4. Confirm the action in the popup modal.
115+
116+
Once frozen:
117+
- The card immediately stops working for purchases
118+
- You'll see a note below the card indicating who froze the card and when
119+
- The employee sees the same message and cannot unfreeze the card themselves
120+
121+
All freeze/unfreeze actions are automatically posted to the workspace chat.
122+
123+
---
124+
100125
# FAQ
101126

102127
## What kind of bank account is required?

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.58.1</string>
47+
<string>9.3.58.7</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.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.58.1</string>
16+
<string>9.3.58.7</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.3.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.58.1</string>
16+
<string>9.3.58.7</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

ios/bundle-react-native-code-and-images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ if [[ -z "$BUNDLE_COMMAND" ]]; then
2929
export BUNDLE_COMMAND="bundle"
3030
fi
3131

32-
"$NODE_BINARY" --print "require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'"
32+
eval "$("$NODE_BINARY" --print "require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'")"

package-lock.json

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

0 commit comments

Comments
 (0)