Merge branch 'main' into @wolewicki/rn-76-upgrade

Expensify · Nov 29, 2024 · 79067dc · 79067dc
2 parents be7a883 + 7be9987
commit 79067dc
Show file tree

Hide file tree

Showing 90 changed files with 4,811 additions and 8,075 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 1009006803
+        versionName "9.0.68-3"
         // 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/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.3</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.3</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.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -2326,7 +2326,7 @@ PODS:
     - React-utils (= 0.76.1)
   - RNAppleAuthentication (2.2.2):
     - React-Core
-  - RNCClipboard (1.14.0):
+  - RNCClipboard (1.15.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3203,7 +3203,7 @@ SPEC CHECKSUMS:
   AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
   AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
   AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
-  boost: 1dca942403ed9342f98334bf4c3621f011aa7946
+  boost: d7090b1a93a9798c029277a8288114f2948f471c
   DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
   EXAV: 8996468e7e113e59d13c6530a0f5f54ee542439e
   EXImageLoader: 759063a65ab016b836f73972d3bb25404888713d
@@ -3326,7 +3326,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 865bafc5c17ec2181620ced1a32c39c38ab2951d
   ReactCommon: 422e364463f33e336fc4db196aeb50fd801d90d6
   RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
-  RNCClipboard: c84275d07e3f73ff296b17e6c27e9ccdc194a0bb
+  RNCClipboard: 8212ca9e8370d0e23bfb7f5a591380da5a63456d
   RNCPicker: 21ae0659666767a5c1253aef985ee5b7c527e345
   RNDeviceInfo: 130237d8e97a89b68f2202d5dd18ac6bb68e7648
   RNFBAnalytics: f76bfa164ac235b00505deb9fc1776634056898c