Merge branch 'main' into dismis-modal

Merge main to fix branch

.eslintrc.js

@@ -8,7 +8,7 @@ const restrictedImportPaths = [
             '',
             "For 'useWindowDimensions', please use '@src/hooks/useWindowDimensions' instead.",
             "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from '@components/Pressable' instead.",
-            "For 'StatusBar', please use '@src/libs/StatusBar' instead.",
+            "For 'StatusBar', please use '@libs/StatusBar' instead.",
             "For 'Text', please use '@components/Text' instead.",
             "For 'ScrollView', please use '@components/ScrollView' instead.",
         ].join('\n'),
@@ -59,8 +59,12 @@ const restrictedImportPaths = [
     },
     {
         name: 'expensify-common',
-        importNames: ['Device'],
-        message: "Do not import Device directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+        importNames: ['Device', 'ExpensiMark'],
+        message: [
+            '',
+            "For 'Device', do not import it directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+            "For 'ExpensiMark', please use '@libs/Parser' instead.",
+        ].join('\n'),
     },
 ];
 

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000504
-        versionName "9.0.5-4"
+        versionCode 1009000505
+        versionName "9.0.5-5"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

docs/_includes/lhn-template.html

@@ -21,25 +21,25 @@
     {% for platform in site.data.routes.platforms %}
         {% if platform.href == activePlatform %}
             <li>
-                <a href="/" class="icon-with-link selected">
-                    <img src="/assets/images/down.svg" class="base-icon"></img>
+                <div class="icon-with-link selected">
+                    <a href="/"><img src="/assets/images/down.svg" class="base-icon"></img></a>
                     <span>{{ platform.title }}</span>
-                </a>
+                </div>
                 {% for hub in platform.hubs %}
                 <ul>
                     {% if hub.href == activeHub %}
-                        <a href="/{{ activePlatform }}/hubs/" class="icon-with-link selected">
-                            <img src="/assets/images/down.svg" class="base-icon"></img>
+                        <div  class="icon-with-link selected">
+                            <a href="/{{ activePlatform }}/hubs"><img src="/assets/images/down.svg" class="base-icon"></img></a> 
                             <span>{{ hub.title }}</span>
-                        </a>
+                        </div>
                         <ul class="nested-treeview">
                             {% for section in hub.sections %}
                                 <li>
                                     {% if section.href == activeSection %}
-                                        <a href="/{{ activePlatform }}/hubs/{{ hub.href }}" class="icon-with-link selected">
-                                            <img src="/assets/images/down.svg" class="base-icon"></img>
+                                        <div class="icon-with-link selected">
+                                            <a href="/{{ activePlatform }}/hubs/{{ hub.href }}"><img src="/assets/images/down.svg" class="base-icon"></img></a>
                                             <span>{{ section.title }}</span>
-                                        </a>
+                                        </div>
                                         <ul>
                                             {% for article in section.articles %}
                                                 {% assign article_href = section.href | append: '/' | append: article.href %}

docs/_sass/_main.scss

@@ -749,6 +749,7 @@ button {
     width: 20px;
     height: 20px;
     cursor: pointer;
+    display: inline-block;
 }
 
 .homepage {

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

@@ -3,78 +3,56 @@ title:  Cardholder Settings and Features
 description: Expensify Card Settings for Employees
 ---
 
-# How to use your Expensify Visa® Commercial Card
-Once you receive your card, you can start using it right away. 
-
-First, you'll want to take note of the Smart Limit tied to your card – this is listed in your card settings via **Settings > Account > Credit Card Import**. This limit represents the total amount of unapproved expenses you can have on the card.
-
-It's crucial to continuously submit your expenses promptly, as that'll ensure they can be approved and restore your full limit. You can always chat with your admin if you need your limit adjusted.
-
-You can swipe your Expensify Card like you would with any other card. As you make purchases, you'll get instant alerts on your phone letting you know if you need to SmartScan receipts. Any SmartScanned receipts should merge with the card expense automatically.
-
-If your organization doesn't require itemized receipts, you can rely on eReceipts instead. As long as the expense isn't lodging-related, Expensify will automatically generate an IRS-compliant eReceipt for every transaction.
-
-You can report and submit Expensify Card expenses just like any other expenses. As they're approved, your Smart Limit will be refreshed accordingly, allowing you to keep making purchases.
-
-## Enable Notifications
-Download the Expensify mobile app and enable push notifications to stay current on your spending activity. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We'll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase. 
-
-Follow the steps below to enable real-time alerts on your mobile device.
-
-**If you have an iPhone**:
-1. Open the Expensify app and tap the three-bar icon in the upper-left corner
-2. Tap **Settings** and enable **Receive realtime alerts**
-3. Accept the confirmation dialogue to go to your iPhone's notification settings for Expensify. Turn on Allow Notifications, and choose the notification types you’d like!
-
-**If you have an Android**:
-1. Go to Settings and open 'Apps and Notifications'.
+# Using Your Expensify Visa® Commercial Card
+
+## Getting Started
+### Activate Your Card
+You can start using your card immediately upon receipt by logging into your Expensify account, heading to your Home tab, and following the prompts on the _**Activate your Expensify Card**_ task. 
+
+### Review your Card's Smart Limit
+Check your card’s Smart Limit via  _**Settings > Account > Credit Card Import**_: 
+- This limit is the total amount of unapproved expenses you can have on the card.
+- If a purchase is more than your card's Smart Limit, it will be declined. 
+
+## Managing Expenses
+- **Submit Expenses Promptly**: Submit your expenses regularly to restore your full limit. Contact your admin if you need a limit adjustment.
+- **Using Your Card**: Swipe your Expensify Card like any other card. You’ll receive instant alerts on your phone for SmartScan receipts. SmartScanned receipts will merge automatically with card expenses.
+- **eReceipts**: If your organization doesn’t require itemized receipts, Expensify will generate IRS-compliant eReceipts for all non-lodging transactions.
+- **Reporting Expenses**: Report and submit Expensify Card expenses as usual. Approved expenses refresh your Smart Limit.
+
+## Enabling Notifications
+Download the Expensify mobile app and enable push notifications to stay updated on spending activity and potential fraud.
+
+#### For iPhone:
+1. Open the Expensify app and tap the three-bar icon in the upper-left corner.
+2. Tap _**Settings > enable Receive real-time alerts**_.
+3. Accept the confirmation to access your iPhone’s notification settings for Expensify.
+4. Turn on **Allow Notifications** and select your notification types.
+
+#### For Android:
+1. Go to _**Settings > Apps and Notifications**_.
 2. Find and open Expensify and enable notifications.
-3. Customize your alerts. Depending on your phone model, you may have extra options to customize the types of notifications you receive.
-
-## Your virtual card
-Once you're assigned a limit, you'll be able to use your virtual card immediately. You can view your virtual card details via **Settings > Account > Credit Card Import > Show Details**. Keep in mind that your virtual card and physical card share a limit.
-
-The virtual Expensify Card includes a card number, expiration date, and security code (CVC). You can use the virtual card for online purchases, in-app transactions, and in-person payments once it's linked to a mobile wallet (Apple Pay or Google Pay).
-
-## How to access your virtual card details
-Here's how to access your virtual card details via the Expensify mobile app:
-1. Tap the three-bar icon in the upper-left corner 
-2. Tap **Settings > Connected Cards**
-3. Under **Virtual Card**, tap **Show Details**
-
-From there, you can view your virtual card's number, CVV, expiration date, and billing address. 
-
-Here's how to access your virtual card details via the Expensify web app:
-1. Head to **Settings > Account > Credit Card Import**
-2. Under **Virtual Card**, click **Show Details**
-
-From there, you can view your virtual card's card number, CVV, expiration date, and billing address.
-
-## How to add your virtual card to a digital wallet (Apple Pay or Google Pay)
-
-To use the Expensify Card for contactless payment, add it to your digital wallet from the mobile app:
-1. Tap the three-bar icon in the upper-left corner 
-2. Tap **Settings > Connected Cards**
-3. Depending on your device, tap **Add to Apple Wallet** or **Add to Gpay** 
-4. Complete the remaining steps
-
-## Expensify Card declines
-As long as you've enabled 'Receive real-time alerts', you'll get a notification explaining the reason for each decline. You can enable alerts in the mobile app by clicking on the three-bar icon in the upper-left corner > **Settings** > toggle **Receive real-time alerts**. 
-
-Here are some reasons an Expensify Card transaction might be declined:
-
-- You have an insufficient card limit
-     - If a transaction exceeds your Expensify Card's available limit, the transaction will be declined. You can see the remaining limit in the mobile app under **Settings > Connected Cards** or in the web app under **Settings > Account > Credit Card Import**. 
-     - Submitting expenses and getting them approved will free up your limit for more spending.
-
-- Your card isn't active yet or it was disabled by your Domain Admin
-- Your card information was entered incorrectly with the merchant. Entering incorrect card information, such as the CVC, ZIP, or expiration date, will also lead to declines. 
-There was suspicious activity
-- If Expensify detects unusual or suspicious activity, we may block transactions as a security measure
-     - This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. 
-     - Check your Expensify Home page to approve unusual merchants and try again.
-     - If the spending looks suspicious, we may complete a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.  
-- The merchant is located in a restricted country
+3. Customize your alerts based on your phone model.
+
+## Using Your Virtual Card
+- **Access Details**: You can view your virtual card details (card number, expiration date, CVC) via _**Settings > Account > Credit Card Import > Show Details**_. The virtual and physical cards share the same limit.
+- **Purchases**: Use the virtual card for online, in-app, and in-person payments when linked to a mobile wallet (Apple Pay or Google Pay).
+
+#### Adding to a Digital Wallet
+To add your Expensify Card to a digital wallet, follow the steps below:
+  1. Tap the three-bar icon in the upper-left corner.
+  2. Tap _**Settings > Connected Cards**_.
+  3. Tap **Add to Apple Wallet** or **Add to Gpay**, depending on your device.
+  4. Complete the steps as prompted.
+
+## Handling Declines
+- **Real-Time Alerts**: Enable real-time alerts in the mobile app (_**Settings > toggle Receive real-time alerts**_) to get notifications for declines.
+- **Common Decline Reasons**:
+  - **Insufficient Limit**: Transactions exceeding the available limit will be declined. You can check your limit in _**Settings > Connected Cards**_ or _**Settings > Account > Credit Card Import**_.
+  - **Inactive or Disabled Card**: Ensure your card is active and not disabled by your Domain Admin.
+  - **Incorrect Information**: Entering incorrect card details (CVC, ZIP, expiration date) will result in declines.
+  - **Suspicious Activity**: Transactions may be blocked for unusual or suspicious activity. Check the Expensify Home page to approve unusual merchants. Suspicious spending may prompt a manual due diligence check, during which your cards will be locked.
+  - **Restricted Country**: Transactions from restricted countries will be declined.
 
 {% include faq-begin.md %}
 ## Can I use Smart Limits with a free Expensify account? 

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.4</string>
+	<string>9.0.5.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.4</string>
+	<string>9.0.5.5</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.4</string>
+	<string>9.0.5.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>