Merge branch 'main' of https://github.com/tienifr/App into revert-294…

…49-ts-migration/withNavigationFallback-hoc
Expensify · Oct 18, 2023 · a7e50e9 · a7e50e9
2 parents a8f3d66 + 3b86da6
commit a7e50e9
Show file tree

Hide file tree

Showing 99 changed files with 997 additions and 483 deletions.
diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
@@ -80,6 +80,10 @@
                         "/": "/search/*",
                         "comment": "Search"
                     },
+                    {
+                        "/": "/send/*",
+                        "comment": "Send money"
+                    },
                     {
                         "/": "/money2020/*",
                         "comment": "Money 2020"

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038601
-        versionName "1.3.86-1"
+        versionCode 1001038603
+        versionName "1.3.86-3"
     }
 
     flavorDimensions "default"

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -70,6 +70,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/send"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
 
                 <!-- Staging URLs -->
@@ -88,6 +89,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/send"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/money2020"/>
             </intent-filter>
         </activity>

diff --git a/docs/_data/_routes.yml b/docs/_data/_routes.yml
@@ -44,16 +44,21 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore how the Expensify Card combines convenience and security to enhance everyday business transactions. Discover how to apply for, oversee, and maximize your card perks here.
 
-      - href: exports
-        title: Exports
-        icon: /assets/images/monitor.svg
-        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+      - href: expensify-partner-program
+        title: Expensify Partner Program
+        icon: /assets/images/handshake.svg
+        description: Discover how to get the most out of Expensify as an ExpensifyApproved! accountant partner. Learn how to set up your clients, receive CPE credits, and take advantage of your partner discount.
 
       - href: get-paid-back
         title: Get Paid Back
         icon: /assets/images/money-into-wallet.svg
         description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
 
+      - href: insights-and-custom-reporting
+        title: Insights & Custom Reporting
+        icon: /assets/images/monitor.svg
+        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+
       - href: integrations
         title: Integrations
         icon: /assets/images/workflow.svg
@@ -64,15 +69,15 @@ platforms:
         icon: /assets/images/envelope-receipt.svg
         description: Master the art of overseeing employees and reports by utilizing Expensify’s automation features and approval workflows.
 
-      - href: policy-and-domain-settings
-        title: Policy & Domain Settings
-        icon: /assets/images/shield.svg
-        description: Discover how to set up and manage policies, define user permissions, and implement compliance rules to maintain a secure and compliant financial management landscape.
-
       - href: send-payments
         title: Send Payments
         icon: /assets/images/money-wings.svg
         description: Uncover step-by-step guidance on sending direct reimbursements to employees, paying an invoice to a vendor, and utilizing third-party payment options.
+
+      - href: workspace-and-domain-settings
+        title: Workspace & Domain Settings
+        icon: /assets/images/shield.svg
+        description: Discover how to set up and manage workspace, define user permissions, and implement compliance rules to maintain a secure and compliant financial management landscape.
 
   - href: new-expensify
     title: New Expensify
@@ -113,16 +118,21 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore how the Expensify Card combines convenience and security to enhance everyday business transactions. Discover how to apply for, oversee, and maximize your card perks here.
 
-      - href: exports
-        title: Exports
-        icon: /assets/images/monitor.svg
-        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+      - href: expensify-partner-program
+        title: Expensify Partner Program
+        icon: /assets/images/handshake.svg
+        description: Discover how to get the most out of Expensify as an ExpensifyApproved! accountant partner. Learn how to set up your clients, receive CPE credits, and take advantage of your partner discount.
 
       - href: get-paid-back
         title: Get Paid Back
         icon: /assets/images/money-into-wallet.svg
         description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
 
+      - href: insights-and-custom-reporting
+        title: Insights & Custom Reporting
+        icon: /assets/images/monitor.svg
+        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+
       - href: integrations
         title: Integrations
         icon: /assets/images/workflow.svg

diff --git a/...ts-and-credit-cards/business-bank-accounts/Add-a-Business-Bank-Account-(AUD).md b/...ts-and-credit-cards/business-bank-accounts/Add-a-Business-Bank-Account-(AUD).md
diff --git a/...cles/new-expensify/exports/Coming-Soon.md → .../expensify-partner-program/Coming-Soon.md b/...cles/new-expensify/exports/Coming-Soon.md → .../expensify-partner-program/Coming-Soon.md
diff --git a/...nsify-classic/exports/Custom-Templates.md → ...-and-custom-reporting/Custom-Templates.md b/...nsify-classic/exports/Custom-Templates.md → ...-and-custom-reporting/Custom-Templates.md
diff --git a/...assic/exports/Default-Export-Templates.md → ...tom-reporting/Default-Export-Templates.md b/...assic/exports/Default-Export-Templates.md → ...tom-reporting/Default-Export-Templates.md
diff --git a/...les/expensify-classic/exports/Insights.md → ...insights-and-custom-reporting/Insights.md b/...les/expensify-classic/exports/Insights.md → ...insights-and-custom-reporting/Insights.md
diff --git a/...y-classic/exports/Other-Export-Options.md → ...-custom-reporting/Other-Export-Options.md b/...y-classic/exports/Other-Export-Options.md → ...-custom-reporting/Other-Export-Options.md
diff --git a/.../policy-and-domain-settings/Categories.md → ...rkspace-and-domain-settings/Categories.md b/.../policy-and-domain-settings/Categories.md → ...rkspace-and-domain-settings/Categories.md
diff --git a/...y-and-domain-settings/Domains-Overview.md → ...e-and-domain-settings/Domains-Overview.md b/...y-and-domain-settings/Domains-Overview.md → ...e-and-domain-settings/Domains-Overview.md
diff --git a/...ic/policy-and-domain-settings/Expenses.md → ...workspace-and-domain-settings/Expenses.md b/...ic/policy-and-domain-settings/Expenses.md → ...workspace-and-domain-settings/Expenses.md
diff --git a/...c/policy-and-domain-settings/Invoicing.md → ...orkspace-and-domain-settings/Invoicing.md b/...c/policy-and-domain-settings/Invoicing.md → ...orkspace-and-domain-settings/Invoicing.md
diff --git a/...ic/policy-and-domain-settings/Per-Diem.md → ...workspace-and-domain-settings/Per-Diem.md b/...ic/policy-and-domain-settings/Per-Diem.md → ...workspace-and-domain-settings/Per-Diem.md
diff --git a/...licy-and-domain-settings/Reimbursement.md → ...pace-and-domain-settings/Reimbursement.md b/...licy-and-domain-settings/Reimbursement.md → ...pace-and-domain-settings/Reimbursement.md
diff --git a/...ic/policy-and-domain-settings/SAML-SSO.md → ...workspace-and-domain-settings/SAML-SSO.md b/...ic/policy-and-domain-settings/SAML-SSO.md → ...workspace-and-domain-settings/SAML-SSO.md
diff --git a/...lassic/policy-and-domain-settings/Tags.md → ...sic/workspace-and-domain-settings/Tags.md b/...lassic/policy-and-domain-settings/Tags.md → ...sic/workspace-and-domain-settings/Tags.md
diff --git a/...y-and-domain-settings/reports/Currency.md → ...e-and-domain-settings/reports/Currency.md b/...y-and-domain-settings/reports/Currency.md → ...e-and-domain-settings/reports/Currency.md
diff --git a/...tings/reports/Report-Fields-And-Titles.md → ...tings/reports/Report-Fields-And-Titles.md b/...tings/reports/Report-Fields-And-Titles.md → ...tings/reports/Report-Fields-And-Titles.md
diff --git a/...main-settings/reports/Scheduled-Submit.md → ...main-settings/reports/Scheduled-Submit.md b/...main-settings/reports/Scheduled-Submit.md → ...main-settings/reports/Scheduled-Submit.md
diff --git a/...olicy-and-domain-settings/tax-tracking.md → ...space-and-domain-settings/tax-tracking.md b/...olicy-and-domain-settings/tax-tracking.md → ...space-and-domain-settings/tax-tracking.md
diff --git a/.../integrations/travel-integrations/Grab.md → .../expensify-partner-program/Coming-Soon.md b/.../integrations/travel-integrations/Grab.md → .../expensify-partner-program/Coming-Soon.md
@@ -2,4 +2,3 @@
 title: Coming Soon
 description: Coming Soon
 ---
-## Resource Coming Soon!
diff --git a/docs/articles/new-expensify/insights-and-custom-reporting/Coming-Soon.md b/docs/articles/new-expensify/insights-and-custom-reporting/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png