resolve merge conflicts

Author: Shahidullah-Muffakir

.github/actions/javascript/checkTestCoverage/action.yml

@@ -0,0 +1,10 @@
+name: 'Check Test Coverage'
+description: 'A simple action that takes a GitHub URL and prints it'
+inputs:
+    GITHUB_URL:
+        description: 'GitHub repository URL to check'
+        required: true
+
+runs:
+    using: 'node20'
+    main: './index.js' 

.github/actions/javascript/checkTestCoverage/index.js

@@ -0,0 +1,17 @@
+const core = require('@actions/core');
+
+async function run() {
+    try {
+        // Get the GitHub URL input
+        const githubUrl = core.getInput('GITHUB_URL');
+        
+        // Print the URL
+        console.log(`GitHub URL: ${githubUrl}`);
+        core.info(`GitHub URL: ${githubUrl}`);
+        
+    } catch (error) {
+        core.setFailed(error.message);
+    }
+}
+
+run(); 

.github/workflows/check-test-coverage.yml

@@ -0,0 +1,22 @@
+name: Check Test Coverage
+
+on:
+  workflow_dispatch:
+    inputs:
+      github_url:
+        description: 'GitHub repository URL to check'
+        required: true
+        type: string
+
+jobs:
+  check-coverage:
+    runs-on: ubuntu-latest
+    name: Check Test Coverage
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        
+      - name: Check Test Coverage
+        uses: ./.github/actions/javascript/checkTestCoverage
+        with:
+          GITHUB_URL: ${{ inputs.github_url }}

Mobile-Expensify

@@ -8,6 +8,7 @@ const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigatio
 
 const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
 const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
+const useLocale = isJestEnv ? realReactNavigation.useTheme : () => ({});
 
 const {triggerTransitionEnd, addListener} = isJestEnv
     ? createAddListenerMock()
@@ -44,14 +45,14 @@ const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
 const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
 const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
 const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
+const usePreventRemove = isJestEnv ? jest.fn() : () => {};
 
 export {
     // Overridden modules
     useIsFocused,
     useTheme,
     useNavigation,
+    useLocale,
     triggerTransitionEnd,
 
     // Theme modules are left alone
@@ -68,7 +69,7 @@ export {
     useScrollToTop,
     useRoute,
     useFocusEffect,
-    UNSTABLE_usePreventRemove,
+    usePreventRemove,
 };
 
 export type {NativeNavigationMock};

__mocks__/@react-navigation/native/index.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017108
-        versionName "9.1.71-8"
+        versionCode 1009017200
+        versionName "9.1.72-0"
         // 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

@@ -33,6 +33,10 @@ const includeModules = [
     'react-native-web',
     'react-native-webview',
     '@react-native-picker',
+    '@react-navigation/material-top-tabs',
+    '@react-navigation/native',
+    '@react-navigation/native-stack',
+    '@react-navigation/stack',
     'react-native-modal',
     'react-native-gesture-handler',
     'react-native-google-places-autocomplete',
@@ -160,6 +164,12 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
     ],
     module: {
         rules: [
+            {
+                test: /\.m?js$/,
+                resolve: {
+                    fullySpecified: false,
+                },
+            },
             // Transpiles and lints all the JS
             {
                 test: /\.(js|ts)x?$/,

config/webpack/webpack.common.ts

@@ -682,7 +682,8 @@
         "zoneinfo",
         "zxcv",
         "zxldvw",
-        "مثال"
+        "مثال",
+        "pnrs"
     ],
     "ignorePaths": [
         "src/languages/de.ts",

cspell.json

@@ -0,0 +1,50 @@
+---
+layout: product
+title: Scan Receipt
+---
+
+# Scan Receipt
+
+SmartScan automatically extracts expense details from receipt images.
+
+## How to Scan
+
+1. Click the **+** button and select **Create expense**
+2. Choose **Scan**
+3. Upload an image or take a photo of your receipt
+4. SmartScan extracts merchant, date, amount, and currency
+5. Choose your workspace and add any required details
+6. Click **Create expense**
+
+## What SmartScan Detects
+
+- **Amount** and currency
+- **Merchant** name and location
+- **Date** of purchase  
+- **Tax** information (when visible)
+- **Category** suggestions based on merchant type
+
+## Supported Receipt Types
+
+- **Photos** - Take with your device camera
+- **Email receipts** - Forward to receipts@expensify.com  
+- **PDF receipts** - Upload from your device
+- **Screenshots** - From apps or websites
+
+## Tips for Best Results
+
+- Ensure receipt text is clear and readable
+- Include the full receipt in the image
+- Good lighting improves accuracy
+- Straight angles work better than tilted photos
+
+## After Scanning
+
+- Review extracted details for accuracy
+- Add description, category, or tags as needed
+- SmartScan learns from your corrections
+
+## Related Links
+
+- [Create an Expense](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-Expense)
+- [Free Features in Expensify](https://help.expensify.com/articles/new-expensify/getting-started/Free-Features-in-Expensify) 

help/ref/:action/:iouType/start/:transactionID/:reportID/scan/:backToReport/index.md

@@ -0,0 +1,63 @@
+---
+layout: product
+title: Accounting Integrations
+---
+
+# Accounting Integrations
+
+Connect your workspace to accounting software to sync expenses and streamline financial management.
+
+## Supported Integrations
+
+**QuickBooks Online**
+- Real-time expense sync
+- Category and vendor mapping  
+- Tax rate synchronization
+
+**QuickBooks Desktop**
+- File-based import/export
+- Chart of accounts import
+- Custom field mapping
+
+**Xero**
+- Automatic report sync
+- Tracking category import
+- Tax rate management
+
+**NetSuite**
+- Advanced multi-entity support
+- Custom dimension mapping
+- Automated bill payments
+
+**Sage Intacct**
+- Department/class tracking
+- Multi-currency support
+- Advanced approval workflows
+
+## Getting Started
+
+1. Go to **Workspaces > [Workspace] > More Features**
+2. Enable **Accounting**
+3. Click **Accounting** in the left menu
+4. Choose your integration and click **Set up**
+5. Follow the connection prompts
+
+## What Gets Synced
+
+**From your accounting system:**
+- Chart of accounts (as categories)
+- Classes, departments, locations (as tags)
+- Tax rates and customers
+- Vendors and bill payment accounts
+
+**To your accounting system:**
+- Approved expense reports
+- Company card transactions  
+- Vendor bills and journal entries
+- Payment records and reconciliation data
+
+## Related Links
+
+- [Connect to QuickBooks Online](https://help.expensify.com/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online)
+- [Connect to Xero](https://help.expensify.com/articles/new-expensify/connections/xero/Connect-to-Xero)
+- [Connect to NetSuite](https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-To-NetSuite)