Merge branch 'Expensify:main' into fix/62634

Author: Tony-MK

.eslintignore

@@ -14,5 +14,6 @@ web/gtm.js
 src/libs/SearchParser/searchParser.js
 src/libs/SearchParser/autocompleteParser.js
 help/_scripts/**
+modules/ExpensifyNitroUtils/nitrogen/**
 Mobile-Expensify/**
 vendor

.gitignore

@@ -150,3 +150,6 @@ react-compiler-output.txt
 
 # React Native Enterprise Framework
 .rnef/
+
+# Generated by bob (for Nitro modules)
+modules/*/lib/

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016303
-        versionName "9.1.63-3"
+        versionCode 1009016306
+        versionName "9.1.63-6"
         // 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"

android/app/build.gradle

@@ -10,6 +10,7 @@
 # Add any project specific keep options here:
 -keep class com.expensify.chat.BuildConfig { *; }
 -keep class com.facebook.** { *; }
+-keep class com.margelo.nitro.** { *; }
 -keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
 
 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).

android/app/proguard-rules.pro

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

android/app/src/main/AndroidManifest.xml

@@ -316,6 +316,7 @@
         "mapboxgl",
         "marcaaron",
         "Marcin",
+        "margelo",
         "Marqeta",
         "mateusz",
         "McAfee",
@@ -689,6 +690,9 @@
         "ios/GoogleService-Info-DEV.plist",
         "ios/AirshipConfig.plist",
         "Mobile-Expensify",
+        "modules/ExpensifyNitroUtils/nitrogen/**",
+        "modules/ExpensifyNitroUtils/android/build.gradle",
+        "modules/ExpensifyNitroUtils/android/src/main/cpp/**",
         "src/TIMEZONES.ts",
         "tests/unit/EmojiTest.ts",
         "tests/unit/FastSearchTest.ts",

assets/images/educational-illustration__multi-scan.svg

@@ -1,46 +1,56 @@
 ---
 title: Merge Accounts
-description: Learn how to merge two Expensify accounts together.
-keywords: [Expensify Classic, merge accounts]
+description: Learn how to merge two Expensify accounts into one and keep all your data in a single login.
+keywords: [Expensify Classic, merge accounts, combine logins, consolidate email addresses, multiple accounts]
 ---
 <div id="expensify-classic" markdown="1">
-  
-If you have multiple Expensify accounts—such as a personal and a company account—you can merge them into one. This process consolidates all receipts, expenses, reports, invoices, bills, imported cards, contact methods, Copilots, and group workspace settings into a single account.
 
-**Important:** Merging accounts is **permanent** and **cannot be undone**.
+If you have more than one Expensify account—like a personal and a company account—you can merge them. This brings all your reports, receipts, settings, and data into one place.
 
-- To merge a company and personal account, log in to your **company account** and merge your **personal account** into it.
-- You **cannot** merge a company account into a personal account.
-- You **cannot** merge two company accounts if they belong to private domains.
+**Important:** Merging accounts is permanent and cannot be undone.
 
-**Note:** This process must be completed from the Expensify website and is not available in the mobile app.
+---
+
+## Before You Start
+
+Make sure you know:
+- Which email address you want to keep as your login going forward.
+- Which email address you want to discard and merge in.
+
+> **You must log into the account you want to keep** and merge the one you no longer need into it.
 
 ---
 
-# Merge Accounts
+## How to Merge Accounts
 
-1. Log in to the **account you want to keep** as your primary Expensify account.
-2. Hover over **Settings** and click **Account**.
-3. Under **Profile** scroll down to the **Merge Accounts** section.
-4. Enter the **email address or phone number** associated with the account you want to merge.
-5. Select the **“Yes, I understand this is not reversible”** checkbox.
+1. Log in at [expensify.com](https://www.expensify.com) using the **email you want to keep**.
+2. Go to **Settings > Account > Profile**.
+3. Scroll down to the **Merge Accounts** section.
+4. Enter the email address or phone number of the account you want to merge.
+5. Confirm the action by checking **“Yes, I understand this is not reversible.”**
 6. Click **Merge Accounts**.
-7. Check your email for the **Magic Code** sent from Expensify.
-8. Copy and paste the code into the field, then click **Merge**.
+7. Check the inbox of the email you're merging in for a Magic Code.
+8. Enter the Magic Code to complete the merge.
 
 ---
 
 # FAQ
 
-## What happens to my data when I merge accounts?
+## What Happens When You Merge?
 
-All the following will be transferred to your primary account:
+The following will be brought into your primary account:
 - Receipts and expenses
 - Expense reports
 - Invoices and bills
 - Imported cards
-- Saved Contact Methods
+- Contact methods
 - Copilots
 - Group workspace settings
 
+## When can I not merge accounts?
+
+- You **cannot** merge two company accounts from private domains.
+- You **cannot** merge a company account **into** a personal account.
+- Merging is only available on the web (not the mobile app).
+
 </div>

cspell.json

@@ -1,32 +1,31 @@
 ---
-title: Add Expensify Card to Apple or Google Pay
-description: Pay with your Expensify Card from your Apple or Google Pay wallet
+title: Add the Expensify Card to Apple or Google Pay
+description: Pay with your Expensify Card by adding it to your Apple Pay or Google Pay wallet for easy contactless payments.
+keywords: [New Expensify, Expensify Card, Apple Pay, Google Pay, mobile wallet, contactless payments, virtual card]
 ---
+
 <div id="new-expensify" markdown="1">
 
-You can use your Expensify Card for contactless in-person payments by adding it to your digital wallet for Apple Pay (for iOS) or Google Pay (for Android).
+You can use your Expensify Card for contactless in-person payments by adding it to your Apple Pay (iOS) or Google Pay (Android) wallet.
 
-{% include selector.html values="mobile" %}
+---
 
-{% include option.html value="mobile" %}
-### Apple Pay
+# Add Expensify Card to Apple Pay (iOS)
 
-1. Open the Apple Pay app.
-2. Tap the + button.
-3. Tap **Debit or Credit Card**.
+1. Open the **Apple Wallet** app.
+2. Tap the **+** button.
+3. Select **Debit or Credit Card**.
 4. Tap **Continue**.
-5. Follow the steps provided to add your virtual card.
-
-### Google Pay
+5. Follow the on-screen steps to add your virtual Expensify Card.
 
-1. Open the Google Pay app.
-2. Tap **Add to Wallet**.
-3. Tap **Payment Card**.
-4. Tap **Add new debit or credit card**.
-5. Add your virtual card details.
+---
 
-{% include end-option.html %}
+# Add Expensify Card to Google Pay (Android)
 
-{% include end-selector.html %}
+1. Open the **Google Wallet** app.
+2. Tap **Add to Wallet**.
+3. Select **Payment card**.
+4. Tap **Add a new debit or credit card**.
+5. Enter your virtual Expensify Card details to complete the setup.
 
 </div>