Merge branch 'main' into jsys/upgrade-react-native-pager-view

Expensify · Nov 8, 2024 · 63914be · 63914be
2 parents f0a34e2 + c286316
commit 63914be
Show file tree

Hide file tree

Showing 140 changed files with 3,418 additions and 789 deletions.
diff --git a/.well-known/assetlinks.json b/.well-known/assetlinks.json
@@ -5,4 +5,12 @@
       "package_name": "com.expensify.chat",
       "sha256_cert_fingerprints": ["2E:65:6F:1C:34:F5:7E:BF:FC:C0:2D:A3:14:0E:83:FE:61:51:F2:9B:5D:59:58:61:C4:4D:A9:99:0C:CA:F4:8E"]
     }
-}]
+  },
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "org.me.mobiexpensifyg",
+      "sha256_cert_fingerprints": ["87:03:DC:2B:20:99:CB:F7:AF:39:0C:8F:F2:E4:78:F2:61:E9:D1:7E:F4:AF:E5:02:D9:72:F2:4D:1F:29:FF:65"]
+    }
+}]
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 1009005801
-        versionName "9.0.58-1"
+        versionCode 1009005900
+        versionName "9.0.59-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"

diff --git a/assets/images/simple-illustrations/simple-illustration__perdiem.svg b/assets/images/simple-illustrations/simple-illustration__perdiem.svg
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
@@ -50,10 +50,10 @@ <h3>Resources</h3>
                         <a href="https://help.expensify.com/" alt="ExpensifyHelp" target="_blank">ExpensifyHelp</a>
                     </li>
                     <li>
-                        <a href="https://community.expensify.com/" alt="Community" target="_blank">Community</a>
+                        <a href="https://www.expensify.com/terms" alt="Terms" target="_blank">Terms of Service</a>
                     </li>
                     <li>
-                        <a href="https://use.expensify.com/privacy" alt="Privacy" target="_blank">Privacy</a>
+                        <a href="https://www.expensify.com/privacy" alt="Privacy" target="_blank">Privacy</a>
                     </li>
                 </ul>
             </div>

diff --git a/docs/articles/expensify-classic/expensify-billing/Change-Plan-Or-Subscription.md b/docs/articles/expensify-classic/expensify-billing/Change-Plan-Or-Subscription.md
@@ -50,7 +50,7 @@ If Auto Renew is disabled then the last bill at the annual rate will be issued o
 # How to downgrade to a free account from an Individual Plan
 ## Web
 1. Log in to your account through a web browser.
-1. Go to **Settings > Policies > Individual > Subscription**.
+1. Go to **Settings > Workspaces > Individual > Subscription**.
 1. Click "Cancel Subscription" to end your Monthly Subscription.
 
 Note: Your subscription is a pre-purchase for 30 days of unlimited SmartScanning. This means that when you cancel, you do not get a refund and instead get to use the remainder of the month of unlimited SmartScanning you purchased.