Merge branch 'Expensify:main' into improvement/52977

Expensify · Nov 30, 2024 · a5e85b2 · a5e85b2
2 parents ac6af2c + 1a6f48e
commit a5e85b2
Show file tree

Hide file tree

Showing 111 changed files with 19,391 additions and 19,340 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006707
-        versionName "9.0.67-7"
+        versionCode 1009006807
+        versionName "9.0.68-7"
         // 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/...xpensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md b/...xpensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md
@@ -28,11 +28,11 @@ The following steps will determine how data will be exported from Expensify to Q
 
 # Step 2: Configure coding/import settings
 
-The following steps help you determine how data will be imported from QuickBooks Online to Expensify:
+The following steps help you determine how data will be imported from QuickBooks Desktop to Expensify:
 
 ![Expensify coding settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-coding-settings.png){:width="100%"}
 
-1. Click Import under the QuickBooks Online connection.
+1. Click Import under the QuickBooks Desktop connection.
 2. Review each of the following import settings:
 - **Chart of Accounts**: The Chart of Accounts is automatically imported from QuickBooks Desktop as categories. This cannot be amended.
 - **Classes**: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.

diff --git a/docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md b/docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md
@@ -168,6 +168,24 @@ Yes, you can edit an expense until it is paid. When an expense is submitted, the
 In Expensify, expense reports group expenses in a batch to be paid or reconciled. When a draft report is open, all new expenses are added to it. 
 
 Once a report is submitted, you can track the status from the **Search** section. Click the **View** button for a specific expense or expense report. The status is displayed at the top of the expense or report.
+
+**How can I enable camera permission for a website on mobile browsers?**
+
+**Google Chrome:**
+1. Open Chrome.
+2. To the right of the address bar, tap More icon > **Settings**.
+3. Tap **Site settings** > **Camera**.
+4. Tap to turn the microphone or camera on or off.
+    - If you find the site you want to use under **Blocked**, tap the site > **Allow**.
+5. Refresh the site.
+
+**Safari:**
+1. Open Safari.
+2. To the left of the address bar, tap More icon > **Site settings** > **Camera**.
+3. Tap **Allow** to grant permission.
+4. Tap **Done**.
+5. Refresh the site.
+
 {% include faq-end.md %}
 
 </div>
diff --git a/docs/assets/images/ExpensifyHelp-Postman-Request-data.png b/docs/assets/images/ExpensifyHelp-Postman-Request-data.png
diff --git a/docs/assets/images/ExpensifyHelp-Postman-Successful-dryrun-response.png b/docs/assets/images/ExpensifyHelp-Postman-Successful-dryrun-response.png
diff --git a/docs/assets/images/ExpensifyHelp-Postman-userID-userSecret-request.png b/docs/assets/images/ExpensifyHelp-Postman-userID-userSecret-request.png
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.67</string>
+	<string>9.0.68</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.67.7</string>
+	<string>9.0.68.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.67</string>
+	<string>9.0.68</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.67.7</string>
+	<string>9.0.68.7</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.67</string>
+	<string>9.0.68</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.67.7</string>
+	<string>9.0.68.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -2266,7 +2266,7 @@ PODS:
     - React-utils (= 0.75.2)
   - RNAppleAuthentication (2.2.2):
     - React-Core
-  - RNCClipboard (1.14.0):
+  - RNCClipboard (1.15.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2717,27 +2717,12 @@ PODS:
     - SDWebImage/Core (~> 5.17)
   - SocketRocket (0.7.0)
   - Turf (2.8.0)
-  - VisionCamera (4.0.0-beta.13):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.01.01.00)
-    - RCTRequired
-    - RCTTypeSafety
+  - VisionCamera (4.6.1):
+    - VisionCamera/Core (= 4.6.1)
+    - VisionCamera/React (= 4.6.1)
+  - VisionCamera/Core (4.6.1)
+  - VisionCamera/React (4.6.1):
     - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - Yoga (0.0.0)
 
 DEPENDENCIES:
@@ -3275,7 +3260,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f
   ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b
   RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
-  RNCClipboard: c84275d07e3f73ff296b17e6c27e9ccdc194a0bb
+  RNCClipboard: 8212ca9e8370d0e23bfb7f5a591380da5a63456d
   RNCPicker: 21ae0659666767a5c1253aef985ee5b7c527e345
   RNDeviceInfo: 130237d8e97a89b68f2202d5dd18ac6bb68e7648
   RNFBAnalytics: f76bfa164ac235b00505deb9fc1776634056898c
@@ -3302,7 +3287,7 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
-  VisionCamera: c6c8aa4b028501fc87644550fbc35a537d4da3fb
+  VisionCamera: c95a8ad535f527562be1fb05fb2fd324578e769c
   Yoga: a1d7895431387402a674fd0d1c04ec85e87909b8
 
 PODFILE CHECKSUM: 15e2f095b9c80d658459723edf84005a6867debf