merge with dev

Expensify · Aug 7, 2024 · c4420be · c4420be
2 parents 9fecc9d + 6a6c242
commit c4420be
Show file tree

Hide file tree

Showing 167 changed files with 2,332 additions and 1,111 deletions.
diff --git a/.github/workflows/reactCompiler.yml b/.github/workflows/reactCompiler.yml
@@ -5,6 +5,7 @@ on:
     paths:
       - ".github/workflows/reactCompiler.yml"
       - "src/**"
+      - "package.json"
 
 jobs:
   check:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009001700
-        versionName "9.0.17-0"
+        versionCode 1009001702
+        versionName "9.0.17-2"
         // 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"

diff --git a/assets/images/simple-illustrations/advanced-approvals-icon-square.svg b/assets/images/simple-illustrations/advanced-approvals-icon-square.svg
diff --git a/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md b/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md
@@ -18,10 +18,13 @@ Expensify allows Workspace Admins to create workflows and automations that deter
 5. Select an approval mode. 
    - **Submit and Close**: No approval is required. Once a report is submitted, it will be automatically approved and closed. This option may be useful if your expense approvals occur in another system or if the submitter and approver are the same person.
    - **Submit and Approve**: All reports go to one person that you assign as the approver. Once a report is submitted, it is sent to the approver. This is the default option. 
-   - **Advanced Approval**: This workflow feature is for companies that require more than one person to approve a report before it can be reimbursed. 
-   Advanced Approval is only available on the Control plan.
-
+   - **Advanced Approval**: Allows for more complex workflows, like assigning different [approvers](https://help.expensify.com/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees) for different employees or requiring secondary approvals for expenses that exceed a [set limit](https://help.expensify.com/articles/expensify-classic/reports/Require-review-for-over-limit-expenses).
 
 To add to your approval workflow, you can also set up approval rules for specific categories and tags. 
 
+### Enforce workflow
+If you want to ensure your employees cannot override the workflow you set for them, enable workflow enforcement on your workspace’s Members tab. Admins will still be able to “take control” of reports and override the set workflow.
+
+Visit our How Complex Approval Workflows Work guide for more details.
+
 </div>
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.17.0</string>
+	<string>9.0.17.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.17.0</string>
+	<string>9.0.17.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.17</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.17.0</string>
+	<string>9.0.17.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/package-lock.json b/package-lock.json